From: simonpj <unknown>
Date: Fri, 18 Oct 2002 13:35:47 +0000 (+0000)
Subject: [project @ 2002-10-18 13:35:46 by simonpj]
X-Git-Tag: Approx_11550_changesets_converted~1532
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9b4d74c78cd4bf34c361d6647e14833e7f59c117;p=ghc-hetmet.git

[project @ 2002-10-18 13:35:46 by simonpj]
Import wibbles
---

diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs
index 766b9ce..3e0cf4a 100644
--- a/ghc/compiler/prelude/PrelInfo.lhs
+++ b/ghc/compiler/prelude/PrelInfo.lhs
@@ -32,6 +32,7 @@ import PrelNames	( basicKnownKeyNames,
 			  noDictClassKeys )
 #ifdef GHCI
 import DsMeta		( templateHaskellNames )
+import NameSet		( nameSetToList )
 #endif
 
 import PrimOp		( allThePrimOps, primOpOcc )
@@ -40,7 +41,6 @@ import Id		( idName )
 import MkId		( mkPrimOpId, wiredInIds )
 import MkId		-- All of it, for re-export
 import Name		( Name, nameOccName )
-import NameSet		( nameSetToList )
 import RdrName		( mkRdrUnqual, getRdrName )
 import HsSyn		( HsTyVarBndr(..) )
 import OccName		( mkVarOcc )
diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs
index e3858d0..badd84d 100644
--- a/ghc/compiler/typecheck/TcRnDriver.lhs
+++ b/ghc/compiler/typecheck/TcRnDriver.lhs
@@ -20,7 +20,7 @@ import {-# SOURCE #-} TcSplice( tcSpliceDecls )
 #endif
 
 import CmdLineOpts	( DynFlag(..), opt_PprStyle_Debug, dopt )
-import HsSyn		( HsModule(..), HsBinds(..), MonoBinds(..), HsDecl(..), HsExpr(..),
+import HsSyn		( HsModule(..), HsBinds(..), MonoBinds(..), HsExpr(..),
 			  Stmt(..), Pat(VarPat), HsStmtContext(..), RuleDecl(..),
 			  HsGroup(..), SpliceDecl(..),
 			  mkSimpleMatch, placeHolderType, toHsType, andMonoBinds,
@@ -37,7 +37,7 @@ import MkId		( unsafeCoerceId )
 import RdrName		( RdrName, getRdrName, mkUnqual, mkRdrUnqual, 
 			  lookupRdrEnv, elemRdrEnv )
 
-import RnHsSyn		( RenamedHsDecl, RenamedStmt, RenamedTyClDecl, 
+import RnHsSyn		( RenamedStmt, RenamedTyClDecl, 
 			  ruleDeclFVs, instDeclFVs, tyClDeclFVs )
 import TcHsSyn		( TypecheckedHsExpr, TypecheckedRuleDecl,
 			  zonkTopBinds, zonkTopDecls, mkHsLet,