Commit d51f42f6 authored by Ian Lynagh's avatar Ian Lynagh

Convert more UniqFM's back to LazyUniqFM's

These fix these failures:
   break008(ghci)
   break009(ghci)
   break026(ghci)
   ghci.prog009(ghci)
   ghci025(ghci)
   print007(ghci)
   prog001(ghci)
   prog002(ghci)
   prog003(ghci)
at least some of which have this symptom:
    Exception: expectJust prune
parent 3efa0623
......@@ -67,7 +67,7 @@ import Outputable
import qualified Pretty
import Unique
import FiniteMap
import UniqFM
import LazyUniqFM
import FastString
import Binary
......
......@@ -47,7 +47,7 @@ import Name
import NameEnv
import NameSet
import qualified OccName
import UniqFM
import LazyUniqFM
import Module
import ListSetOps
import DynFlags
......
......@@ -36,7 +36,7 @@ import Name
import OccName
import PrelNames
import Module
import UniqFM
import LazyUniqFM
import FastString
import UniqSupply
import FiniteMap
......
......@@ -52,7 +52,7 @@ import SrcLoc
import Maybes
import ErrUtils
import Finder
import UniqFM
import LazyUniqFM
import StaticFlags
import Outputable
import BinIface
......
......@@ -223,7 +223,7 @@ import SrcLoc
import PackageConfig hiding ( Version )
import Outputable
import BasicTypes hiding ( SuccessFlag(..) )
import UniqFM
import LazyUniqFM
import Util hiding ( eqListBy )
import FiniteMap
import FastString
......
......@@ -50,7 +50,7 @@ import Name
import NameEnv
import OccName
import Module
import UniqFM
import LazyUniqFM
import UniqSupply
import Outputable
import ErrUtils
......
......@@ -32,7 +32,7 @@ import Finder
import HscTypes
import Outputable
import Module
import UniqFM ( eltsUFM )
import LazyUniqFM ( eltsUFM )
import ErrUtils
import DynFlags
import StaticFlags ( v_Ld_inputs, opt_Static, WayName(..) )
......
......@@ -36,7 +36,7 @@ import PrelNames ( gHC_PRIM )
import DynFlags ( DynFlags(..), isOneShot, GhcMode(..) )
import Outputable
import FiniteMap
import UniqFM
import LazyUniqFM
import Maybes ( expectJust )
import Data.IORef ( IORef, writeIORef, readIORef, modifyIORef )
......
......@@ -248,7 +248,7 @@ import StaticFlags
import SysTools ( initSysTools, cleanTempFiles, cleanTempFilesExcept,
cleanTempDirs )
import Module
import UniqFM
import LazyUniqFM
import UniqSet
import Unique
import FiniteMap
......
......@@ -104,7 +104,7 @@ import MkExternalCore ( emitExternalCore )
import ParserCore
import ParserCoreUtils
import FastString
import UniqFM ( emptyUFM )
import LazyUniqFM ( emptyUFM )
import UniqSupply ( initUs_ )
import Bag ( unitBag )
......
......@@ -110,7 +110,7 @@ import Maybes ( orElse, expectJust, catMaybes )
import Outputable
import BreakArray
import SrcLoc ( SrcSpan, Located )
import UniqFM ( lookupUFM, eltsUFM, emptyUFM )
import LazyUniqFM ( lookupUFM, eltsUFM, emptyUFM )
import UniqSupply ( UniqSupply )
import FastString ( FastString )
import StringBuffer ( StringBuffer )
......
......@@ -67,7 +67,7 @@ import Unique
import UniqSupply
import Module
import Panic
import UniqFM
import LazyUniqFM
import Maybes
import ErrUtils
import Util
......
......@@ -50,7 +50,7 @@ import DynFlags ( DynFlag(..) )
import HscTypes (FixItem(..))
import Name
import NameEnv
import UniqFM
import LazyUniqFM
import NameSet
import PrelNames ( isUnboundName )
import RdrName ( RdrName, rdrNameOcc )
......
......@@ -55,7 +55,7 @@ import Name ( Name, nameIsLocalOrFrom, mkInternalName, isWiredInName,
nameSrcLoc, nameSrcSpan, nameOccName, nameModule, isExternalName )
import NameSet
import NameEnv
import UniqFM
import LazyUniqFM
import DataCon ( dataConFieldLabels )
import OccName ( OccName, tcName, isDataOcc, pprNonVarNameSpace, occNameSpace,
reportIfUnused, occNameFS )
......
......@@ -50,7 +50,7 @@ import PrelNames ( thFAKE, hasKey, assertIdKey, assertErrorName,
import Name ( Name, nameOccName, nameModule, nameIsLocalOrFrom )
import NameSet
import UniqFM
import LazyUniqFM
import RdrName ( RdrName, extendLocalRdrEnv, lookupLocalRdrEnv, hideSomeUnquals )
import LoadIface ( loadInterfaceForName )
import UniqSet ( isEmptyUniqSet, emptyUniqSet )
......
......@@ -36,7 +36,7 @@ import PrelNames
import Module
import Name
import NameEnv
import UniqFM
import LazyUniqFM
import NameSet
import OccName
import HscTypes
......
......@@ -68,7 +68,7 @@ import Constants ( mAX_TUPLE_SIZE )
import Name ( Name, nameOccName, nameModule_maybe, getOccName, nameSrcSpan )
import OccName ( occEnvElts )
import NameSet
import UniqFM
import LazyUniqFM
import RdrName ( RdrName, GlobalRdrElt(..), Provenance(..),
extendLocalRdrEnv, lookupLocalRdrEnv, hideSomeUnquals,
mkRdrUnqual, nameRdrName, gre_name, globalRdrEnvElts, isLocalGRE )
......
......@@ -46,7 +46,7 @@ import Class ( FunDep )
import Name ( Name, nameOccName )
import NameSet
import NameEnv
import UniqFM
import LazyUniqFM
import OccName
import Outputable
import SrcLoc ( Located(..), unLoc, noLoc )
......
......@@ -25,7 +25,7 @@ import Name
import Module
import SrcLoc
import Outputable
import UniqFM
import LazyUniqFM
import FiniteMap
import Maybe
......
......@@ -69,7 +69,7 @@ import ErrUtils
import Id
import Var
import Module
import UniqFM
import LazyUniqFM
import Name
import NameEnv
import NameSet
......
......@@ -44,7 +44,7 @@ import Bag
import Outputable
import UniqSupply
import Unique
import UniqFM
import LazyUniqFM
import DynFlags
import StaticFlags
import FastString
......
......@@ -64,7 +64,7 @@ import NameSet
import Var
import VarEnv
import Module
import UniqFM
import LazyUniqFM
import SrcLoc
import VarSet
import ErrUtils
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment