From: simonpj Date: Thu, 27 Jan 2005 11:52:11 +0000 (+0000) Subject: [project @ 2005-01-27 11:51:56 by simonpj] X-Git-Tag: Initial_conversion_from_CVS_complete~1178 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=56f5bc18ff86c1ea54c1a93bffe2a011595887f5;p=ghc-hetmet.git [project @ 2005-01-27 11:51:56 by simonpj] Import trimming --- diff --git a/ghc/compiler/rename/RnEnv.lhs b/ghc/compiler/rename/RnEnv.lhs index 7596138..09bb3bc 100644 --- a/ghc/compiler/rename/RnEnv.lhs +++ b/ghc/compiler/rename/RnEnv.lhs @@ -32,9 +32,11 @@ module RnEnv ( import LoadIface ( loadHomeInterface, loadSrcInterface ) import IfaceEnv ( lookupOrig, newGlobalBinder, newIPName ) -import HsSyn +import HsSyn ( FixitySig(..), ReboundNames, HsExpr(..), + HsType(..), HsExplicitForAll(..), LHsTyVarBndr, LHsType, + LSig, Sig(..), Fixity, hsLTyVarName, hsLTyVarLocNames, replaceTyVarName ) import RdrHsSyn ( extractHsTyRdrTyVars ) -import RdrName ( RdrName, rdrNameModule, rdrNameOcc, isQual, isUnqual, isOrig, +import RdrName ( RdrName, rdrNameModule, isQual, isUnqual, isOrig, mkRdrUnqual, setRdrNameSpace, rdrNameOcc, pprGlobalRdrEnv, lookupGRE_RdrName, isExact_maybe, isSrcRdrName, @@ -42,7 +44,6 @@ import RdrName ( RdrName, rdrNameModule, rdrNameOcc, isQual, isUnqual, isOrig, isLocalGRE, extendLocalRdrEnv, elemLocalRdrEnv, lookupLocalRdrEnv, Provenance(..), pprNameProvenance, ImportSpec(..) ) -import HsTypes ( replaceTyVarName ) import HscTypes ( availNames, ModIface(..), FixItem(..), lookupFixity ) import TcRnMonad import Name ( Name, nameIsLocalOrFrom, mkInternalName, @@ -60,7 +61,6 @@ import Util ( sortLe ) import ListSetOps ( removeDups ) import List ( nubBy ) import CmdLineOpts -import FastString ( FastString ) \end{code} %********************************************************* diff --git a/ghc/compiler/rename/RnSource.lhs b/ghc/compiler/rename/RnSource.lhs index f382282..48838ee 100644 --- a/ghc/compiler/rename/RnSource.lhs +++ b/ghc/compiler/rename/RnSource.lhs @@ -41,7 +41,6 @@ import NameEnv import Outputable import SrcLoc ( Located(..), unLoc, getLoc, noLoc ) import CmdLineOpts ( DynFlag(..) ) -import DriverPhases ( isHsBoot ) import Maybes ( seqMaybe ) import Maybe ( catMaybes, isNothing ) \end{code} diff --git a/ghc/compiler/typecheck/TcClassDcl.lhs b/ghc/compiler/typecheck/TcClassDcl.lhs index ad62de6..a1015f0 100644 --- a/ghc/compiler/typecheck/TcClassDcl.lhs +++ b/ghc/compiler/typecheck/TcClassDcl.lhs @@ -18,7 +18,7 @@ import RnHsSyn ( maybeGenericMatch, extractHsTyVars ) import RnExpr ( rnLExpr ) import RnEnv ( lookupTopBndrRn, lookupImportedName ) -import Inst ( Inst, InstOrigin(..), instToId, newDicts, newDictsAtLoc, newMethod ) +import Inst ( instToId, newDicts, newDictsAtLoc, newMethod ) import TcEnv ( tcLookupLocatedClass, tcExtendIdEnv2, tcExtendTyVarEnv, InstInfo(..), pprInstInfoDetails, diff --git a/ghc/compiler/typecheck/TcHsType.lhs b/ghc/compiler/typecheck/TcHsType.lhs index ed58587..2841332 100644 --- a/ghc/compiler/typecheck/TcHsType.lhs +++ b/ghc/compiler/typecheck/TcHsType.lhs @@ -39,9 +39,9 @@ import TcUnify ( unifyFunKind, checkExpectedKind ) import TcType ( Type, PredType(..), ThetaType, MetaDetails(Flexi), hoistForAllTys, TcType, TcTyVar, TcKind, TcThetaType, TcTauType, - mkForAllTys, mkFunTys, tcEqType, isPredTy, mkFunTy, + mkFunTy, mkSigmaTy, mkPredTy, mkGenTyConApp, mkTyConApp, mkAppTys, - tcSplitFunTy_maybe, tcSplitForAllTys, typeKind ) + typeKind ) import Kind ( Kind, isLiftedTypeKind, liftedTypeKind, ubxTupleKind, openTypeKind, argTypeKind, splitKindFunTys ) import Id ( idName ) @@ -52,14 +52,12 @@ import Name ( Name, mkInternalName ) import OccName ( mkOccName, tvName ) import NameSet import PrelNames ( genUnitTyConName ) -import Type ( deShadowTy ) import TysWiredIn ( mkListTy, mkPArrTy, mkTupleTy ) import Bag ( bagToList ) import BasicTypes ( Boxity(..) ) import SrcLoc ( Located(..), unLoc, noLoc, srcSpanStart ) import UniqSupply ( uniqsFromSupply ) import Outputable -import List ( nubBy ) \end{code}