From: simonpj <unknown>
Date: Fri, 2 Apr 2004 11:55:34 +0000 (+0000)
Subject: [project @ 2004-04-02 11:55:34 by simonpj]
X-Git-Tag: Initial_conversion_from_CVS_complete~1932
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f1915c2a39c7b89389a3cd25bbc4d495ea7cf75d;p=ghc-hetmet.git

[project @ 2004-04-02 11:55:34 by simonpj]
Import wibbles
---

diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs
index a7cec10..6af188c 100644
--- a/ghc/compiler/typecheck/TcRnDriver.lhs
+++ b/ghc/compiler/typecheck/TcRnDriver.lhs
@@ -35,7 +35,7 @@ import TcType		( tidyTopType )
 import Inst		( showLIE )
 import TcBinds		( tcTopBinds )
 import TcDefaults	( tcDefaults )
-import TcEnv		( tcExtendGlobalValEnv, tcLookupGlobal )
+import TcEnv		( tcExtendGlobalValEnv )
 import TcRules		( tcRules )
 import TcForeign	( tcForeignImports, tcForeignExports )
 import TcInstDcls	( tcInstDecls1, tcInstDecls2 )
@@ -62,7 +62,6 @@ import Outputable
 import HscTypes		( ModGuts(..), HscEnv(..),
 			  GhciMode(..), noDependencies,
 			  Deprecs( NoDeprecs ), plusDeprecs,
-			  GenAvailInfo(Avail), availsToNameSet, availName,
 			  ForeignStubs(NoStubs), TypeEnv, typeEnvTyCons, 
 			  extendTypeEnvWithIds, typeEnvIds, typeEnvTyCons,
 			  emptyFixityEnv
@@ -81,7 +80,7 @@ import TcMType		( zonkTcType )
 import TcMatches	( tcStmtsAndThen, TcStmtCtxt(..) )
 import TcSimplify	( tcSimplifyInteractive, tcSimplifyInfer )
 import TcType		( Type, mkForAllTys, mkFunTys, mkTyConApp, tyVarsOfType )
-import TcEnv		( tcLookupTyCon, tcLookupId )
+import TcEnv		( tcLookupTyCon, tcLookupId, tcLookupGlobal )
 import Inst		( tcStdSyntaxName )
 import RnExpr		( rnStmts, rnLExpr )
 import RnNames		( exportsToAvails )
@@ -102,7 +101,7 @@ import PrelNames	( iNTERACTIVE, ioTyConName, printName, monadNames, itName, retu
 import Module		( ModuleName, lookupModuleEnvByName )
 import HscTypes		( InteractiveContext(..),
 			  HomeModInfo(..), typeEnvElts, 
-			  TyThing(..), availNames, icPrintUnqual,
+			  TyThing(..), availName, availNames, icPrintUnqual,
 			  ModIface(..), ModDetails(..) )
 import BasicTypes	( RecFlag(..), Fixity )
 import Bag		( unitBag )