Fix import lists

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index d16672c..970bd20 100644 (file)
--- a/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
@@ -10,7 +10,6 @@ module Desugar ( deSugar, deSugarExpr ) where
 
 #include "HsVersions.h"
 
-import Breakpoints
 import DynFlags
 import StaticFlags
 import HscTypes

diff --git a/compiler/deSugar/DsBreakpoint.lhs b/compiler/deSugar/DsBreakpoint.lhs
index c714a5e..dbf7ed2 100644 (file)
--- a/compiler/deSugar/DsBreakpoint.lhs
+++ b/compiler/deSugar/DsBreakpoint.lhs
@@ -14,45 +14,42 @@ module DsBreakpoint(
                    , mkBreakpointExpr
                    ) where
 
-import IOEnv            ( ioToIOEnv )
-import TysPrim          ( alphaTyVar )
-import TysWiredIn       ( intTy, stringTy, mkTupleTy, mkListTy, boolTy )
+import IOEnv
+import TysPrim
+import TysWiredIn
 import PrelNames        
-import Module           ( moduleName, moduleNameFS, modulePackageId )
-import PackageConfig    ( packageIdFS)
-import SrcLoc           ( SrcLoc, Located(..), SrcSpan, srcSpanFile,
-                          noLoc, noSrcLoc, isGoodSrcSpan,
-                          srcLocLine, srcLocCol, srcSpanStart )
-
-import TyCon            ( isUnLiftedTyCon, tyConDataCons )
-import TypeRep          ( Type(..) )
+import Module
+import PackageConfig
+import SrcLoc
+import TyCon
+import TypeRep
 import DataCon          
 import Type             
-import MkId             ( unsafeCoerceId, lazyId )
-import Name             ( Name, mkInternalName )
-import Var              ( mkTyVar )
-import Id               ( Id, idType, mkGlobalId, idName )
+import MkId
+import Name
+import Var
+import Id 
 
-import IdInfo           ( vanillaIdInfo, GlobalIdDetails (VanillaGlobal) )
-import BasicTypes       ( Boxity(Boxed) )
-import OccName          ( mkOccName, tvName )
+import IdInfo
+import BasicTypes
+import OccName
 
 import TcRnMonad
 import HsSyn            
-import HsLit            ( HsLit(HsString, HsInt) )
-import CoreSyn          ( CoreExpr, Expr (App) )
-import CoreUtils        ( exprType )
+import HsLit
+import CoreSyn
+import CoreUtils
 import Outputable
-import ErrUtils         ( debugTraceMsg )
-import FastString       ( mkFastString, unpackFS )
-import DynFlags         ( GhcMode(..), DynFlag(..) )
+import ErrUtils
+import FastString
+import DynFlags
  
 import DsMonad 
 import {-#SOURCE#-}DsExpr ( dsLExpr ) 
 import Control.Monad
 import Data.IORef
-import Foreign.StablePtr ( newStablePtr, castStablePtrToPtr )
-import GHC.Exts         ( Ptr(..), Int(..), addr2Int#, unsafeCoerce# )
+import Foreign.StablePtr
+import GHC.Exts
 
 mkBreakpointExpr :: SrcSpan -> Id -> DsM (LHsExpr Id)
 mkBreakpointExpr loc bkptFuncId = do
@@ -132,7 +129,7 @@ dynBreakpoint :: SrcSpan -> DsM (LHsExpr Id)
 dynBreakpoint loc | not (isGoodSrcSpan loc) = 
                          pprPanic "dynBreakpoint" (ppr loc)
 dynBreakpoint loc = do 
-    let autoBreakpoint = mkGlobalId VanillaGlobal breakpointAutoName 
+    let autoBreakpoint = Id.mkGlobalId VanillaGlobal breakpointAutoName 
                          breakpointAutoTy vanillaIdInfo
     dflags <- getDOptsDs 
     ioToIOEnv$ debugTraceMsg dflags 3 (text "Breakpoint inserted at " <> ppr loc)
@@ -173,7 +170,7 @@ mkJumpFunc bkptFuncId
                                  (TyVarTy tyvar))))))))
         build name extra  = do 
             ATyCon opaqueTyCon <- dsLookupGlobal opaqueTyConName
-            return$ mkGlobalId VanillaGlobal name
+            return$ Id.mkGlobalId VanillaGlobal name
                       (basicType extra (mkTyConApp opaqueTyCon [])) vanillaIdInfo
         mkTupleType tys = mkTupleTy Boxed (length tys) tys
 

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 8ff654e..f06a728 100644 (file)
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -28,7 +28,6 @@ import ByteCodeLink
 import ByteCodeItbls
 import ByteCodeAsm
 import RtClosureInspect
-import Var
 import IfaceEnv
 import Config
 import OccName
@@ -63,7 +62,6 @@ import Control.Arrow    ( second )
 import Data.IORef
 import Data.List
 import Foreign.Ptr
-import GHC.Exts
 
 import System.IO
 import System.Directory

diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs
index ae97423..790749b 100644 (file)
--- a/compiler/ghci/RtClosureInspect.hs
+++ b/compiler/ghci/RtClosureInspect.hs
@@ -50,22 +50,18 @@ import HscTypes         ( HscEnv )
 \r
 import DataCon          \r
 import Type             \r
-import TcRnMonad\r
+import TcRnMonad        ( TcM, initTcPrintErrors, ioToTcRn, recoverM, writeMutVar )\r
 import TcType\r
 import TcMType\r
 import TcUnify\r
 import TcGadt\r
-import DriverPhases\r
 import TyCon           \r
 import Var\r
 import Name \r
+import VarEnv\r
+import OccName\r
+import VarSet\r
 import Unique\r
-import UniqSupply\r
-import Var              ( setVarUnique, mkTyVar, tyVarKind, setTyVarKind )\r
-import VarEnv           ( mkVarEnv )\r
-import OccName          ( emptyTidyOccEnv )\r
-import VarSet           ( VarSet, mkVarSet, varSetElems, unionVarSets )\r
-import Unique           ( getUnique, incrUnique )\r
 import {-#SOURCE#-} TcRnDriver ( tcRnRecoverDataCon )\r
 \r
 import TysPrim         \r
@@ -73,7 +69,6 @@ import PrelNames
 import TysWiredIn\r
 \r
 import Constants        ( wORD_SIZE )\r
-import FastString       ( mkFastString )\r
 import Outputable\r
 import Maybes\r
 import Panic\r
@@ -85,12 +80,11 @@ import GHC.Exts
 import GHC.Int          ( Int32(..),  Int64(..) )\r
 import GHC.Word         ( Word32(..), Word64(..) )\r
 \r
-import Control.Monad    ( liftM, liftM2, msum )\r
+import Control.Monad\r
 import Data.Maybe\r
 import Data.Array.Base\r
 import Data.List        ( partition )\r
 import Foreign.Storable\r
-import Foreign          ( unsafePerformIO )\r
 \r
 ---------------------------------------------\r
 -- * A representation of semi evaluated Terms\r

diff --git a/compiler/main/Breakpoints.hs b/compiler/main/Breakpoints.hs
index 34e07fb..fccf1a8 100644 (file)
--- a/compiler/main/Breakpoints.hs
+++ b/compiler/main/Breakpoints.hs
@@ -18,7 +18,7 @@ import Name
 import Var                       ( Id )\r
 import PrelNames\r
 \r
-import GHC.Exts                  ( unsafeCoerce# )\r
+import GHC.Exts\r
 \r
 #ifdef GHCI\r
 data BkptHandler a = BkptHandler {\r