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

diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs
index 0221a1b..22941a2 100644 (file)
--- a/compiler/basicTypes/Module.lhs
+++ b/compiler/basicTypes/Module.lhs
@@ -67,7 +67,7 @@ import Outputable
 import qualified Pretty
 import Unique
 import FiniteMap
-import UniqFM
+import LazyUniqFM
 import FastString
 import Binary
 

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index eaae5d0..892171c 100644 (file)
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -47,7 +47,7 @@ import Name
 import NameEnv
 import NameSet
 import qualified OccName
-import UniqFM
+import LazyUniqFM
 import Module
 import ListSetOps
 import DynFlags

diff --git a/compiler/iface/IfaceEnv.lhs b/compiler/iface/IfaceEnv.lhs
index ce90c8c..86f43cb 100644 (file)
--- a/compiler/iface/IfaceEnv.lhs
+++ b/compiler/iface/IfaceEnv.lhs
@@ -36,7 +36,7 @@ import Name
 import OccName
 import PrelNames
 import Module
-import UniqFM
+import LazyUniqFM
 import FastString
 import UniqSupply
 import FiniteMap

diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index a2afdcc..5df77fc 100644 (file)
--- a/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
@@ -52,7 +52,7 @@ import SrcLoc
 import Maybes
 import ErrUtils
 import Finder
-import UniqFM
+import LazyUniqFM
 import StaticFlags
 import Outputable
 import BinIface

diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs
index c0543fb..124e7aa 100644 (file)
--- a/compiler/iface/MkIface.lhs
+++ b/compiler/iface/MkIface.lhs
@@ -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

diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index 1e8d1ca..339eb60 100644 (file)
--- a/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
@@ -50,7 +50,7 @@ import Name
 import NameEnv
 import OccName
 import Module
-import UniqFM
+import LazyUniqFM
 import UniqSupply
 import Outputable      
 import ErrUtils

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index fd55544..b05a20a 100644 (file)
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -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(..) )

diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs
index f50e12a..b76bd97 100644 (file)
--- a/compiler/main/Finder.lhs
+++ b/compiler/main/Finder.lhs
@@ -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 )

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index ec62de5..0caa1cb 100644 (file)
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -248,7 +248,7 @@ import StaticFlags
 import SysTools     ( initSysTools, cleanTempFiles, cleanTempFilesExcept,
                       cleanTempDirs )
 import Module
-import UniqFM
+import LazyUniqFM
 import UniqSet
 import Unique
 import FiniteMap

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index 8176601..9b984ed 100644 (file)
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -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 )
 

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 72229ec..07c7568 100644 (file)
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -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 )

diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs
index 79a1056..7014d28 100644 (file)
--- a/compiler/main/InteractiveEval.hs
+++ b/compiler/main/InteractiveEval.hs
@@ -67,7 +67,7 @@ import Unique
 import UniqSupply
 import Module
 import Panic
-import UniqFM
+import LazyUniqFM
 import Maybes
 import ErrUtils
 import Util

diff --git a/compiler/rename/RnBinds.lhs b/compiler/rename/RnBinds.lhs
index 628f67e..638e955 100644 (file)
--- a/compiler/rename/RnBinds.lhs
+++ b/compiler/rename/RnBinds.lhs
@@ -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 )

diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 801dda8..47595e2 100644 (file)
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -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 )

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index ae26383..a73d1a8 100644 (file)
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -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 )

diff --git a/compiler/rename/RnNames.lhs b/compiler/rename/RnNames.lhs
index ed3efd2..b9e491e 100644 (file)
--- a/compiler/rename/RnNames.lhs
+++ b/compiler/rename/RnNames.lhs
@@ -36,7 +36,7 @@ import PrelNames
 import Module
 import Name
 import NameEnv
-import UniqFM
+import LazyUniqFM
 import NameSet
 import OccName
 import HscTypes

diff --git a/compiler/rename/RnPat.lhs b/compiler/rename/RnPat.lhs
index 5a26395..9d3dc04 100644 (file)
--- a/compiler/rename/RnPat.lhs
+++ b/compiler/rename/RnPat.lhs
@@ -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 )

diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index 8847f3b..741440f 100644 (file)
--- a/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
@@ -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 )

diff --git a/compiler/typecheck/FamInst.lhs b/compiler/typecheck/FamInst.lhs
index 2da3966..ca5a7e9 100644 (file)
--- a/compiler/typecheck/FamInst.lhs
+++ b/compiler/typecheck/FamInst.lhs
@@ -25,7 +25,7 @@ import Name
 import Module
 import SrcLoc
 import Outputable
-import UniqFM
+import LazyUniqFM
 import FiniteMap
 
 import Maybe

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 235b045..f0942b1 100644 (file)
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -69,7 +69,7 @@ import ErrUtils
 import Id
 import Var
 import Module
-import UniqFM
+import LazyUniqFM
 import Name
 import NameEnv
 import NameSet

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index 2d74e77..11e6bba 100644 (file)
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -44,7 +44,7 @@ import Bag
 import Outputable
 import UniqSupply
 import Unique
-import UniqFM
+import LazyUniqFM
 import DynFlags
 import StaticFlags
 import FastString

diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs
index c1ab87d..3868e0f 100644 (file)
--- a/compiler/typecheck/TcRnTypes.lhs
+++ b/compiler/typecheck/TcRnTypes.lhs
@@ -64,7 +64,7 @@ import NameSet
 import Var
 import VarEnv
 import Module
-import UniqFM
+import LazyUniqFM
 import SrcLoc
 import VarSet
 import ErrUtils