From: simonpj Date: Thu, 29 Dec 2005 12:06:13 +0000 (+0000) Subject: [project @ 2005-12-29 12:06:13 by simonpj] X-Git-Tag: final_switch_to_darcs,_this_repo_is_now_live~76 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=63539f9d057f2143ea395da99584bc898b321c9b;p=ghc-hetmet.git [project @ 2005-12-29 12:06:13 by simonpj] Trim imports --- diff --git a/ghc/compiler/coreSyn/CoreSubst.lhs b/ghc/compiler/coreSyn/CoreSubst.lhs index a4b86ea..24bf7df 100644 --- a/ghc/compiler/coreSyn/CoreSubst.lhs +++ b/ghc/compiler/coreSyn/CoreSubst.lhs @@ -37,7 +37,7 @@ import Var ( setVarUnique, isId ) import Id ( idType, setIdType, maybeModifyIdInfo, isLocalId ) import IdInfo ( IdInfo, SpecInfo(..), specInfo, setSpecInfo, isEmptySpecInfo, unfoldingInfo, setUnfoldingInfo, seqSpecInfo, - WorkerInfo(..), workerExists, workerInfo, setWorkerInfo, WorkerInfo + WorkerInfo(..), workerExists, workerInfo, setWorkerInfo ) import Unique ( Unique ) import UniqSupply ( UniqSupply, uniqFromSupply, uniqsFromSupply ) diff --git a/ghc/compiler/specialise/Rules.lhs b/ghc/compiler/specialise/Rules.lhs index 6bb2eb1..4d74314 100644 --- a/ghc/compiler/specialise/Rules.lhs +++ b/ghc/compiler/specialise/Rules.lhs @@ -22,14 +22,14 @@ import CoreFVs ( exprFreeVars, exprsFreeVars, rulesRhsFreeVars ) import CoreUnfold ( isCheapUnfolding, unfoldingTemplate ) import CoreUtils ( tcEqExprX ) import PprCore ( pprRules ) -import Type ( Type ) +import Type ( TvSubstEnv ) import TcType ( tcSplitTyConApp_maybe ) import CoreTidy ( tidyRules ) import Id ( Id, idUnfolding, isLocalId, isGlobalId, idName, idSpecialisation, idCoreRules, setIdSpecialisation ) import IdInfo ( SpecInfo( SpecInfo ) ) import Var ( Var ) -import VarEnv ( IdEnv, TyVarEnv, InScopeSet, emptyTidyEnv, +import VarEnv ( IdEnv, InScopeSet, emptyTidyEnv, emptyInScopeSet, mkInScopeSet, extendInScopeSetList, emptyVarEnv, lookupVarEnv, extendVarEnv, nukeRnEnvL, mkRnEnv2, rnOccR, rnOccL, inRnEnvR, @@ -352,7 +352,6 @@ matchN in_scope tmpl_vars tmpl_es target_es -- for uniformity with IdSubstEnv type SubstEnv = (TvSubstEnv, IdSubstEnv) type IdSubstEnv = IdEnv CoreExpr -type TvSubstEnv = TyVarEnv Type emptySubstEnv :: SubstEnv emptySubstEnv = (emptyVarEnv, emptyVarEnv) diff --git a/ghc/compiler/specialise/SpecConstr.lhs b/ghc/compiler/specialise/SpecConstr.lhs index 7463c9b..6a2cd92 100644 --- a/ghc/compiler/specialise/SpecConstr.lhs +++ b/ghc/compiler/specialise/SpecConstr.lhs @@ -28,10 +28,8 @@ import Name ( nameOccName, nameSrcLoc ) import Rules ( addIdSpecialisations, mkLocalRule, rulesOfBinds ) import OccName ( mkSpecOcc ) import ErrUtils ( dumpIfSet_dyn ) -import DynFlags ( DynFlags, DynFlag(..) ) +import DynFlags ( DynFlags, DynFlag(..) ) import BasicTypes ( Activation(..) ) -import Outputable - import Maybes ( orElse ) import Util ( mapAccumL, lengthAtLeast, notNull ) import List ( nubBy, partition )