From 5f3bef9e47e5ba78983c5081eacaee00f953279d Mon Sep 17 00:00:00 2001 From: simonpj Date: Tue, 30 Nov 2004 14:28:19 +0000 Subject: [PATCH] [project @ 2004-11-30 14:28:02 by simonpj] Import trimming --- ghc/compiler/coreSyn/CoreLint.lhs | 4 ++-- ghc/compiler/coreSyn/CoreUtils.lhs | 5 ++--- ghc/compiler/typecheck/TcDeriv.lhs | 2 +- ghc/compiler/typecheck/TcInstDcls.lhs | 2 +- ghc/compiler/typecheck/TcType.lhs | 4 +--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ghc/compiler/coreSyn/CoreLint.lhs b/ghc/compiler/coreSyn/CoreLint.lhs index 724907b..2f36d53 100644 --- a/ghc/compiler/coreSyn/CoreLint.lhs +++ b/ghc/compiler/coreSyn/CoreLint.lhs @@ -19,7 +19,7 @@ import Unify ( coreRefineTys ) import Bag import Literal ( literalType ) import DataCon ( dataConRepType, isVanillaDataCon, dataConTyCon, dataConResTy ) -import Var ( Var, Id, TyVar, idType, tyVarKind, isTyVar, isId, mustHaveLocalBinding ) +import Var ( Var, Id, TyVar, idType, tyVarKind, mustHaveLocalBinding ) import VarSet import Name ( getSrcLoc ) import PprCore @@ -34,7 +34,7 @@ import Type ( Type, tyVarsOfType, eqType, substTyWith, emptyTvSubst, extendTvInScope, TvSubst, TvSubstEnv, setTvSubstEnv, substTy, extendTvSubst, isInScope ) -import TyCon ( isPrimTyCon, TyCon ) +import TyCon ( isPrimTyCon ) import BasicTypes ( RecFlag(..), isNonRec ) import CmdLineOpts import Outputable diff --git a/ghc/compiler/coreSyn/CoreUtils.lhs b/ghc/compiler/coreSyn/CoreUtils.lhs index 9ef4549..043be8e 100644 --- a/ghc/compiler/coreSyn/CoreUtils.lhs +++ b/ghc/compiler/coreSyn/CoreUtils.lhs @@ -41,7 +41,7 @@ import GLAEXTS -- For `xori` import CoreSyn import PprCore ( pprCoreExpr ) -import Var ( Var, isId, isTyVar ) +import Var ( Var ) import VarEnv import Name ( hashName ) import Packages ( isDllName ) @@ -62,8 +62,7 @@ import Type ( Type, mkFunTy, mkForAllTy, splitFunTy_maybe, splitFunTy, applyTys, isUnLiftedType, seqType, mkTyVarTy, splitForAllTy_maybe, isForAllTy, splitRecNewType_maybe, - splitTyConApp_maybe, eqType, funResultTy, applyTy, - funResultTy, applyTy + splitTyConApp_maybe, eqType, funResultTy, applyTy ) import TyCon ( tyConArity ) -- gaw 2004 diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs index a2b84ca..a81f8fb 100644 --- a/ghc/compiler/typecheck/TcDeriv.lhs +++ b/ghc/compiler/typecheck/TcDeriv.lhs @@ -36,7 +36,7 @@ import DataCon ( isNullarySrcDataCon, isVanillaDataCon, dataConOrigArgTys ) import Maybes ( catMaybes ) import RdrName ( RdrName ) import Name ( Name, getSrcLoc ) -import NameSet ( NameSet, emptyNameSet, duDefs ) +import NameSet ( duDefs ) import Kind ( splitKindFunTys ) import TyCon ( tyConTyVars, tyConDataCons, tyConArity, tyConHasGenerics, tyConStupidTheta, isProductTyCon, isDataTyCon, newTyConRhs, diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs index d428fd0..6049fe5 100644 --- a/ghc/compiler/typecheck/TcInstDcls.lhs +++ b/ghc/compiler/typecheck/TcInstDcls.lhs @@ -34,7 +34,7 @@ import Var ( Id, idName, idType ) import MkId ( mkDictFunId, rUNTIME_ERROR_ID ) import FunDeps ( checkInstFDs ) import Name ( Name, getSrcLoc ) -import NameSet ( unitNameSet, emptyNameSet, unionNameSets ) +import NameSet ( unitNameSet, emptyNameSet ) import UnicodeUtil ( stringToUtf8 ) import Maybe ( catMaybes ) import SrcLoc ( srcLocSpan, unLoc, noLoc, Located(..), srcSpanStart ) diff --git a/ghc/compiler/typecheck/TcType.lhs b/ghc/compiler/typecheck/TcType.lhs index 218d8df..5dcac23 100644 --- a/ghc/compiler/typecheck/TcType.lhs +++ b/ghc/compiler/typecheck/TcType.lhs @@ -122,11 +122,10 @@ import TypeRep ( Type(..), TyNote(..), funTyCon ) -- friend import Type ( -- Re-exports tyVarsOfType, tyVarsOfTypes, tyVarsOfPred, - tyVarsOfTheta, Kind, Type, PredType(..), + tyVarsOfTheta, Kind, PredType(..), ThetaType, unliftedTypeKind, liftedTypeKind, openTypeKind, mkArrowKind, isLiftedTypeKind, isUnliftedTypeKind, - isOpenTypeKind, mkArrowKinds, mkForAllTy, mkForAllTys, defaultKind, isArgTypeKind, isOpenTypeKind, mkFunTy, mkFunTys, zipFunTys, @@ -169,7 +168,6 @@ import OccName ( OccName, mkDictOcc ) import PrelNames -- Lots (e.g. in isFFIArgumentTy) import TysWiredIn ( unitTyCon, charTyCon, listTyCon ) import BasicTypes ( IPName(..), ipNameName ) -import Unique ( Unique, Uniquable(..) ) import SrcLoc ( SrcLoc, SrcSpan ) import Util ( cmpList, thenCmp, snocView ) import Maybes ( maybeToBool, expectJust ) -- 1.7.10.4