Commit c9959e41 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Remove LazyUniqFM; fixes trac #3880

parent 78f5cf9c
......@@ -75,7 +75,7 @@ import Outputable
import qualified Pretty
import Unique
import FiniteMap
import LazyUniqFM
import UniqFM
import FastString
import Binary
import Util
......
......@@ -24,7 +24,7 @@ module NameEnv (
import Name
import Unique
import LazyUniqFM
import UniqFM
import Maybes
import Outputable
\end{code}
......
......@@ -430,7 +430,6 @@ Library
GraphPpr
IOEnv
Interval
LazyUniqFM
ListSetOps
Maybes
MonadUtils
......
......@@ -38,7 +38,7 @@ import Name
import NameEnv
import NameSet
import qualified OccName
import LazyUniqFM
import UniqFM
import Module
import ListSetOps
import DynFlags
......
......@@ -28,7 +28,7 @@ import Var
import Name
import PrelNames
import Module
import LazyUniqFM
import UniqFM
import FastString
import UniqSupply
import FiniteMap
......
......@@ -42,7 +42,7 @@ import Module
import Maybes
import ErrUtils
import Finder
import LazyUniqFM
import UniqFM
import StaticFlags
import Outputable
import BinIface
......
......@@ -83,7 +83,7 @@ import Digraph
import SrcLoc
import Outputable
import BasicTypes hiding ( SuccessFlag(..) )
import LazyUniqFM
import UniqFM
import Unique
import Util hiding ( eqListBy )
import FiniteMap
......
......@@ -48,7 +48,7 @@ import NameEnv
import OccurAnal ( occurAnalyseExpr )
import Demand ( isBottomingSig )
import Module
import LazyUniqFM
import UniqFM
import UniqSupply
import Outputable
import ErrUtils
......
......@@ -19,7 +19,7 @@ module Annotations (
import Name
import Module ( Module )
import Outputable
import LazyUniqFM
import UniqFM
import Serialized
import Unique
......
......@@ -35,7 +35,7 @@ import Finder
import HscTypes
import Outputable
import Module
import LazyUniqFM ( eltsUFM )
import UniqFM ( eltsUFM )
import ErrUtils
import DynFlags
import StaticFlags ( v_Ld_inputs, opt_Static, WayName(..) )
......
......@@ -34,7 +34,7 @@ import Util
import PrelNames ( gHC_PRIM )
import DynFlags
import Outputable
import LazyUniqFM
import UniqFM
import Maybes ( expectJust )
import Exception ( evaluate )
......
......@@ -284,8 +284,7 @@ import SysTools ( initSysTools, cleanTempFiles, cleanTempFilesExcept,
cleanTempDirs )
import Annotations
import Module
import LazyUniqFM
import qualified UniqFM as UFM
import UniqFM
import FiniteMap
import Panic
import Digraph
......@@ -2533,7 +2532,7 @@ packageDbModules :: GhcMonad m =>
-> m [Module]
packageDbModules only_exposed = do
dflags <- getSessionDynFlags
let pkgs = UFM.eltsUFM (pkgIdMap (pkgState dflags))
let pkgs = eltsUFM (pkgIdMap (pkgState dflags))
return $
[ mkModule pid modname | p <- pkgs
, not only_exposed || exposed p
......
......@@ -109,7 +109,7 @@ import HscStats ( ppSourceStats )
import HscTypes
import MkExternalCore ( emitExternalCore )
import FastString
import LazyUniqFM ( emptyUFM )
import UniqFM ( emptyUFM )
import UniqSupply ( initUs_ )
import Bag ( unitBag )
import Exception
......
......@@ -146,7 +146,7 @@ import Maybes ( orElse, expectJust, catMaybes )
import Outputable
import BreakArray
import SrcLoc ( SrcSpan, Located(..) )
import LazyUniqFM ( lookupUFM, eltsUFM, emptyUFM )
import UniqFM ( lookupUFM, eltsUFM, emptyUFM )
import UniqSupply ( UniqSupply )
import FastString
import StringBuffer ( StringBuffer )
......
......@@ -59,7 +59,7 @@ import Unique
import UniqSupply
import Module
import Panic
import LazyUniqFM
import UniqFM
import Maybes
import ErrUtils
import Util
......
......@@ -48,7 +48,7 @@ import Name ( Name, nameIsLocalOrFrom, mkInternalName, isWiredInName,
nameSrcLoc, nameSrcSpan, nameOccName, nameModule, isExternalName )
import NameSet
import NameEnv
import LazyUniqFM
import UniqFM
import DataCon ( dataConFieldLabels )
import OccName
import Module ( Module, ModuleName )
......
......@@ -78,7 +78,7 @@ import qualified ErrUtils as Err
import Bag
import Maybes
import UniqSupply
import LazyUniqFM ( UniqFM, mapUFM, filterUFM )
import UniqFM ( UniqFM, mapUFM, filterUFM )
import FiniteMap
import Util ( split )
......
......@@ -47,7 +47,6 @@ import UniqSupply
import Outputable
import FastString
import UniqFM
import qualified LazyUniqFM as L
import MonadUtils
import Control.Monad ( zipWithM )
import Data.List
......@@ -555,7 +554,7 @@ data ScEnv = SCE { sc_size :: Maybe Int, -- Size threshold
-- Domain is OutIds (*after* applying the substitution)
-- Used even for top-level bindings (but not imported ones)
sc_annotations :: L.UniqFM SpecConstrAnnotation
sc_annotations :: UniqFM SpecConstrAnnotation
}
---------------------
......@@ -580,7 +579,7 @@ instance Outputable Value where
ppr LambdaVal = ptext (sLit "<Lambda>")
---------------------
initScEnv :: DynFlags -> L.UniqFM SpecConstrAnnotation -> ScEnv
initScEnv :: DynFlags -> UniqFM SpecConstrAnnotation -> ScEnv
initScEnv dflags anns
= SCE { sc_size = specConstrThreshold dflags,
sc_count = specConstrCount dflags,
......@@ -689,7 +688,7 @@ extendCaseBndrs env case_bndr con alt_bndrs
ignoreTyCon :: ScEnv -> TyCon -> Bool
ignoreTyCon env tycon
= L.lookupUFM (sc_annotations env) tycon == Just NoSpecConstr
= lookupUFM (sc_annotations env) tycon == Just NoSpecConstr
ignoreType :: ScEnv -> Type -> Bool
ignoreType env ty
......@@ -715,7 +714,7 @@ forceSpecArgTy env ty
forceSpecArgTy env ty
| Just (tycon, tys) <- splitTyConApp_maybe ty
, tycon /= funTyCon
= L.lookupUFM (sc_annotations env) tycon == Just ForceSpecConstr
= lookupUFM (sc_annotations env) tycon == Just ForceSpecConstr
|| any (forceSpecArgTy env) tys
forceSpecArgTy _ _ = False
......
......@@ -15,7 +15,7 @@ import Name
import Module
import SrcLoc
import Outputable
import LazyUniqFM
import UniqFM
import FiniteMap
import FastString
......
......@@ -59,7 +59,7 @@ import Id
import VarEnv
import Var
import Module
import LazyUniqFM
import UniqFM
import Name
import NameEnv
import NameSet
......
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