From db375d630cb6e3377e48daaa0388ba5a4f798f7b Mon Sep 17 00:00:00 2001 From: "simonpj@microsoft.com" Date: Fri, 6 Oct 2006 13:18:30 +0000 Subject: [PATCH] Import trimming --- compiler/basicTypes/Var.lhs | 7 ++----- compiler/main/HscTypes.lhs | 2 +- compiler/main/Main.hs | 4 ++-- compiler/typecheck/TcRnDriver.lhs | 1 - compiler/types/Type.lhs | 14 +++++++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs index 017e355..faf32d7 100644 --- a/compiler/basicTypes/Var.lhs +++ b/compiler/basicTypes/Var.lhs @@ -35,14 +35,11 @@ module Var ( #include "HsVersions.h" -import {-# SOURCE #-} TypeRep( Type, Kind, isCoSuperKind ) +import {-# SOURCE #-} TypeRep( Type, Kind ) import {-# SOURCE #-} TcType( TcTyVarDetails, pprTcTyVarDetails ) import {-# SOURCE #-} IdInfo( GlobalIdDetails, notGlobalId, IdInfo, seqIdInfo ) -import Name ( Name, NamedThing(..), - setNameUnique, nameUnique, mkSysTvName, - mkSystemVarName - ) +import Name ( Name, NamedThing(..), setNameUnique, nameUnique, mkSysTvName ) import Unique ( Unique, Uniquable(..), mkUniqueGrimily, getKey#, mkBuiltinUnique ) import FastTypes diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs index 2c0fa6c..34f6555 100644 --- a/compiler/main/HscTypes.lhs +++ b/compiler/main/HscTypes.lhs @@ -85,7 +85,7 @@ import Id ( Id ) import Type ( TyThing(..) ) import Class ( Class, classSelIds, classATs, classTyCon ) -import TyCon ( TyCon, tyConSelIds, tyConDataCons, isNewTyCon, +import TyCon ( TyCon, tyConSelIds, tyConDataCons, newTyConCo_maybe, tyConFamilyCoercion_maybe ) import DataCon ( DataCon, dataConImplicitIds ) import PrelNames ( gHC_PRIM ) diff --git a/compiler/main/Main.hs b/compiler/main/Main.hs index 52097d9..0dd1cbe 100644 --- a/compiler/main/Main.hs +++ b/compiler/main/Main.hs @@ -27,13 +27,13 @@ import InteractiveUI ( ghciWelcomeMsg, interactiveUI ) -- Various other random stuff that we need import Config ( cProjectVersion, cBooterVersion, cProjectName ) -import Packages ( dumpPackages, initPackages ) +import Packages ( dumpPackages ) import DriverPhases ( Phase(..), isSourceFilename, anyHsc, startPhase, isHaskellSrcFilename ) import StaticFlags ( staticFlags, v_Ld_inputs, parseStaticFlags ) import DynFlags ( defaultDynFlags ) import BasicTypes ( failed ) -import ErrUtils ( Message, debugTraceMsg, putMsg ) +import ErrUtils ( putMsg ) import FastString ( getFastStringTable, isZEncoded, hasZEncoding ) import Outputable import Util diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs index 73cfb83..372ccab 100644 --- a/compiler/typecheck/TcRnDriver.lhs +++ b/compiler/typecheck/TcRnDriver.lhs @@ -35,7 +35,6 @@ import RdrHsSyn ( findSplice ) import PrelNames ( runMainIOName, rootMainKey, rOOT_MAIN, mAIN, main_RDR_Unqual ) import RdrName ( RdrName, mkRdrUnqual, emptyGlobalRdrEnv ) -import TyCon ( isOpenTyCon ) import TcHsSyn ( zonkTopDecls ) import TcExpr ( tcInferRho ) import TcRnMonad diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs index 7c05b6d..f816493 100644 --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs @@ -115,22 +115,26 @@ import Name ( NamedThing(..), tidyNameOcc ) import Class ( Class, classTyCon ) import PrelNames( openTypeKindTyConKey, unliftedTypeKindTyConKey, ubxTupleKindTyConKey, argTypeKindTyConKey ) -import TyCon ( TyCon, isRecursiveTyCon, isPrimTyCon, +import TyCon ( TyCon, isPrimTyCon, isUnboxedTupleTyCon, isUnLiftedTyCon, isFunTyCon, isNewTyCon, isClosedNewTyCon, newTyConRep, newTyConRhs, - isAlgTyCon, tyConArity, isSuperKindTyCon, + isAlgTyCon, isSuperKindTyCon, tcExpandTyCon_maybe, coreExpandTyCon_maybe, - tyConKind, PrimRep(..), tyConPrimRep, tyConUnique, - isCoercionTyCon + tyConKind, PrimRep(..), tyConPrimRep, tyConUnique ) -- others import StaticFlags ( opt_DictsStrict ) -import Util ( mapAccumL, seqList, lengthIs, snocView, thenCmp, isEqual, all2 ) +import Util ( mapAccumL, seqList, snocView, thenCmp, isEqual, all2 ) import Outputable import UniqSet ( sizeUniqSet ) -- Should come via VarSet import Maybe ( isJust ) + +#ifdef DEBUG +import TyCon ( isRecursiveTyCon, tyConArity, isCoercionTyCon ) +import Util ( lengthIs ) +#endif \end{code} -- 1.7.10.4