From d1675fe00e1972a0acf130b0e484ac83e908ff0a Mon Sep 17 00:00:00 2001 From: simonpj Date: Mon, 29 Nov 2004 16:24:21 +0000 Subject: [PATCH] [project @ 2004-11-29 16:24:16 by simonpj] Trim imports --- ghc/compiler/coreSyn/CoreUtils.lhs | 1 - ghc/compiler/deSugar/Desugar.lhs | 8 ++++---- ghc/compiler/iface/IfaceEnv.lhs | 2 +- ghc/compiler/iface/MkIface.lhs | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ghc/compiler/coreSyn/CoreUtils.lhs b/ghc/compiler/coreSyn/CoreUtils.lhs index 270d44d..9ef4549 100644 --- a/ghc/compiler/coreSyn/CoreUtils.lhs +++ b/ghc/compiler/coreSyn/CoreUtils.lhs @@ -1049,7 +1049,6 @@ eqExpr e1 e2 where env' = extendVarEnvList env [(v1,v2) | ((v1,_),(v2,_)) <- zip ps1 ps2] eq_rhs (_,r1) (_,r2) = eq env' r1 r2 --- gaw 2004 eq env (Case e1 v1 t1 a1) (Case e2 v2 t2 a2) = eq env e1 e2 && t1 `eqType` t2 && diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs index 39f3978..8f624dd 100644 --- a/ghc/compiler/deSugar/Desugar.lhs +++ b/ghc/compiler/deSugar/Desugar.lhs @@ -10,7 +10,7 @@ module Desugar ( deSugar, deSugarExpr ) where import CmdLineOpts ( DynFlag(..), DynFlags(..), dopt, opt_SccProfilingOn ) import HscTypes ( ModGuts(..), ModGuts, HscEnv(..), GhciMode(..), - Dependencies(..), TypeEnv, IsBootInterface, unQualInScope ) + Dependencies(..), TypeEnv, IsBootInterface ) import HsSyn ( RuleDecl(..), RuleBndr(..), HsExpr(..), LHsExpr, HsBindGroup(..), LRuleDecl, HsBind(..) ) import TcRnTypes ( TcGblEnv(..), ImportAvails(..) ) @@ -32,16 +32,16 @@ import RdrName ( GlobalRdrEnv ) import NameSet import VarEnv import VarSet -import Bag ( Bag, isEmptyBag, mapBag, emptyBag, bagToList ) +import Bag ( Bag, isEmptyBag, emptyBag, bagToList ) import CoreLint ( showPass, endPass ) import CoreFVs ( ruleRhsFreeVars ) import Packages ( PackageState(thPackageId) ) import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings, - mkWarnMsg, errorsFound, WarnMsg ) + errorsFound, WarnMsg ) import ListSetOps ( insertList ) import Outputable import UniqSupply ( mkSplitUniqSupply ) -import SrcLoc ( Located(..), SrcSpan, unLoc ) +import SrcLoc ( Located(..), unLoc ) import DATA_IOREF ( readIORef ) import FastString import Util ( sortLe ) diff --git a/ghc/compiler/iface/IfaceEnv.lhs b/ghc/compiler/iface/IfaceEnv.lhs index d639e96..3a3842f 100644 --- a/ghc/compiler/iface/IfaceEnv.lhs +++ b/ghc/compiler/iface/IfaceEnv.lhs @@ -30,7 +30,7 @@ import Name ( Name, nameUnique, nameModule, import OccName ( OccName, isTupleOcc_maybe, tcName, dataName, lookupOccEnv, unitOccEnv, extendOccEnv, extendOccEnvList ) import PrelNames ( gHC_PRIM, pREL_TUP ) -import Module ( Module, mkModule, emptyModuleEnv, +import Module ( Module, emptyModuleEnv, lookupModuleEnv, extendModuleEnv_C ) import UniqSupply ( UniqSupply, splitUniqSupply, uniqFromSupply, uniqsFromSupply ) import FiniteMap ( emptyFM, lookupFM, addToFM ) diff --git a/ghc/compiler/iface/MkIface.lhs b/ghc/compiler/iface/MkIface.lhs index ebbca13..57ba589 100644 --- a/ghc/compiler/iface/MkIface.lhs +++ b/ghc/compiler/iface/MkIface.lhs @@ -183,7 +183,7 @@ import IfaceSyn ( IfaceDecl(..), IfaceClassOp(..), IfaceConDecl(..), import LoadIface ( readIface, loadInterface, ifaceInstGates ) import BasicTypes ( Version, initialVersion, bumpVersion ) import TcRnMonad -import TcRnTypes ( ImportAvails(..), mkModDeps ) +import TcRnTypes ( mkModDeps ) import TcType ( isFFITy ) import HscTypes ( ModIface(..), TyThing(..), IfacePackage(..), ModGuts(..), ModGuts, IfaceExport, -- 1.7.10.4