diff options
Diffstat (limited to 'compiler/GHC/Rename')
-rw-r--r-- | compiler/GHC/Rename/Binds.hs | 18 | ||||
-rw-r--r-- | compiler/GHC/Rename/Doc.hs | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/Env.hs | 18 | ||||
-rw-r--r-- | compiler/GHC/Rename/Expr.hs | 14 | ||||
-rw-r--r-- | compiler/GHC/Rename/Expr.hs-boot | 6 | ||||
-rw-r--r-- | compiler/GHC/Rename/Fixity.hs | 12 | ||||
-rw-r--r-- | compiler/GHC/Rename/Names.hs | 25 | ||||
-rw-r--r-- | compiler/GHC/Rename/Pat.hs | 12 | ||||
-rw-r--r-- | compiler/GHC/Rename/Source.hs | 26 | ||||
-rw-r--r-- | compiler/GHC/Rename/Splice.hs | 14 | ||||
-rw-r--r-- | compiler/GHC/Rename/Splice.hs-boot | 2 | ||||
-rw-r--r-- | compiler/GHC/Rename/Types.hs | 12 | ||||
-rw-r--r-- | compiler/GHC/Rename/Unbound.hs | 10 | ||||
-rw-r--r-- | compiler/GHC/Rename/Utils.hs | 12 |
14 files changed, 92 insertions, 91 deletions
diff --git a/compiler/GHC/Rename/Binds.hs b/compiler/GHC/Rename/Binds.hs index e50c97d54c..d0e4392fb8 100644 --- a/compiler/GHC/Rename/Binds.hs +++ b/compiler/GHC/Rename/Binds.hs @@ -45,19 +45,19 @@ import GHC.Rename.Utils ( HsDocContext(..), mapFvRn, extendTyVarEnvFVRn , checkUnusedRecordWildcard , checkDupAndShadowedNames, bindLocalNamesFV ) import GHC.Driver.Session -import Module -import Name -import NameEnv -import NameSet -import RdrName ( RdrName, rdrNameOcc ) -import SrcLoc +import GHC.Types.Module +import GHC.Types.Name +import GHC.Types.Name.Env +import GHC.Types.Name.Set +import GHC.Types.Name.Reader ( RdrName, rdrNameOcc ) +import GHC.Types.SrcLoc as SrcLoc import ListSetOps ( findDupsEq ) -import BasicTypes ( RecFlag(..), TypeOrKind(..) ) +import GHC.Types.Basic ( RecFlag(..), TypeOrKind(..) ) import Digraph ( SCC(..) ) import Bag import Util import Outputable -import UniqSet +import GHC.Types.Unique.Set import Maybes ( orElse ) import OrdList import qualified GHC.LanguageExtensions as LangExt @@ -577,7 +577,7 @@ depAnalBinds binds_w_dus sccs = depAnal (\(_, defs, _) -> defs) (\(_, _, uses) -> nonDetEltsUniqSet uses) -- It's OK to use nonDetEltsUniqSet here as explained in - -- Note [depAnal determinism] in NameEnv. + -- Note [depAnal determinism] in GHC.Types.Name.Env. (bagToList binds_w_dus) get_binds (AcyclicSCC (bind, _, _)) = (NonRecursive, unitBag bind) diff --git a/compiler/GHC/Rename/Doc.hs b/compiler/GHC/Rename/Doc.hs index 2f6a796196..2ccf2bfe8d 100644 --- a/compiler/GHC/Rename/Doc.hs +++ b/compiler/GHC/Rename/Doc.hs @@ -6,7 +6,7 @@ import GhcPrelude import TcRnTypes import GHC.Hs -import SrcLoc +import GHC.Types.SrcLoc rnMbLHsDoc :: Maybe LHsDocString -> RnM (Maybe LHsDocString) diff --git a/compiler/GHC/Rename/Env.hs b/compiler/GHC/Rename/Env.hs index a860bdb53f..5e4a5a7ba0 100644 --- a/compiler/GHC/Rename/Env.hs +++ b/compiler/GHC/Rename/Env.hs @@ -49,26 +49,26 @@ import GhcPrelude import GHC.Iface.Load ( loadInterfaceForName, loadSrcInterface_maybe ) import GHC.Iface.Env import GHC.Hs -import RdrName +import GHC.Types.Name.Reader import GHC.Driver.Types import TcEnv import TcRnMonad import RdrHsSyn ( filterCTuple, setRdrNameSpace ) import TysWiredIn -import Name -import NameSet -import NameEnv -import Avail -import Module +import GHC.Types.Name +import GHC.Types.Name.Set +import GHC.Types.Name.Env +import GHC.Types.Avail +import GHC.Types.Module import GHC.Core.ConLike import GHC.Core.DataCon import GHC.Core.TyCon import ErrUtils ( MsgDoc ) import PrelNames ( rOOT_MAIN ) -import BasicTypes ( pprWarningTxtForMsg, TopLevelFlag(..), TupleSort(..) ) -import SrcLoc +import GHC.Types.Basic ( pprWarningTxtForMsg, TopLevelFlag(..), TupleSort(..) ) +import GHC.Types.SrcLoc as SrcLoc import Outputable -import UniqSet ( uniqSetAny ) +import GHC.Types.Unique.Set ( uniqSetAny ) import Util import Maybes import GHC.Driver.Session diff --git a/compiler/GHC/Rename/Expr.hs b/compiler/GHC/Rename/Expr.hs index 79df0331b3..87a98abd52 100644 --- a/compiler/GHC/Rename/Expr.hs +++ b/compiler/GHC/Rename/Expr.hs @@ -32,7 +32,7 @@ import GHC.Rename.Binds ( rnLocalBindsAndThen, rnLocalValBindsLHS, rnLocalValBin import GHC.Hs import TcEnv ( isBrackStage ) import TcRnMonad -import Module ( getModule ) +import GHC.Types.Module ( getModule ) import GHC.Rename.Env import GHC.Rename.Fixity import GHC.Rename.Utils ( HsDocContext(..), bindLocalNamesFV, checkDupNames @@ -47,17 +47,17 @@ import GHC.Rename.Pat import GHC.Driver.Session import PrelNames -import BasicTypes -import Name -import NameSet -import RdrName -import UniqSet +import GHC.Types.Basic +import GHC.Types.Name +import GHC.Types.Name.Set +import GHC.Types.Name.Reader +import GHC.Types.Unique.Set import Data.List import Util import ListSetOps ( removeDups ) import ErrUtils import Outputable -import SrcLoc +import GHC.Types.SrcLoc import FastString import Control.Monad import TysWiredIn ( nilDataConName ) diff --git a/compiler/GHC/Rename/Expr.hs-boot b/compiler/GHC/Rename/Expr.hs-boot index 77dec1b56a..a5292471d8 100644 --- a/compiler/GHC/Rename/Expr.hs-boot +++ b/compiler/GHC/Rename/Expr.hs-boot @@ -1,9 +1,9 @@ module GHC.Rename.Expr where -import Name +import GHC.Types.Name import GHC.Hs -import NameSet ( FreeVars ) +import GHC.Types.Name.Set ( FreeVars ) import TcRnTypes -import SrcLoc ( Located ) +import GHC.Types.SrcLoc ( Located ) import Outputable ( Outputable ) rnLExpr :: LHsExpr GhcPs diff --git a/compiler/GHC/Rename/Fixity.hs b/compiler/GHC/Rename/Fixity.hs index 4c55bb3e53..cf5ca883da 100644 --- a/compiler/GHC/Rename/Fixity.hs +++ b/compiler/GHC/Rename/Fixity.hs @@ -20,15 +20,15 @@ import GhcPrelude import GHC.Iface.Load import GHC.Hs -import RdrName +import GHC.Types.Name.Reader import GHC.Driver.Types import TcRnMonad -import Name -import NameEnv -import Module -import BasicTypes ( Fixity(..), FixityDirection(..), minPrecedence, +import GHC.Types.Name +import GHC.Types.Name.Env +import GHC.Types.Module +import GHC.Types.Basic ( Fixity(..), FixityDirection(..), minPrecedence, defaultFixity, SourceText(..) ) -import SrcLoc +import GHC.Types.SrcLoc import Outputable import Maybes import Data.List diff --git a/compiler/GHC/Rename/Names.hs b/compiler/GHC/Rename/Names.hs index b04260e3df..286de91a9e 100644 --- a/compiler/GHC/Rename/Names.hs +++ b/compiler/GHC/Rename/Names.hs @@ -44,23 +44,23 @@ import GHC.Rename.Utils ( warnUnusedTopBinds, mkFieldEnv ) import GHC.Iface.Load ( loadSrcInterface ) import TcRnMonad import PrelNames -import Module -import Name -import NameEnv -import NameSet -import Avail -import FieldLabel +import GHC.Types.Module +import GHC.Types.Name +import GHC.Types.Name.Env +import GHC.Types.Name.Set +import GHC.Types.Avail +import GHC.Types.FieldLabel import GHC.Driver.Types -import RdrName +import GHC.Types.Name.Reader import RdrHsSyn ( setRdrNameSpace ) import Outputable import Maybes -import SrcLoc -import BasicTypes ( TopLevelFlag(..), StringLiteral(..) ) +import GHC.Types.SrcLoc as SrcLoc +import GHC.Types.Basic ( TopLevelFlag(..), StringLiteral(..) ) import Util import FastString import FastStringEnv -import Id +import GHC.Types.Id import GHC.Core.Type import GHC.Core.PatSyn import qualified GHC.LanguageExtensions as LangExt @@ -1065,7 +1065,8 @@ filterImports iface decl_spec (Just (want_hiding, L l import_items)) -- Look up the children in the sub-names of the parent let subnames = case ns of -- The tc is first in ns, [] -> [] -- if it is there at all - -- See the AvailTC Invariant in Avail.hs + -- See the AvailTC Invariant in + -- GHC.Types.Avail (n1:ns1) | n1 == name -> ns1 | otherwise -> ns case lookupChildren (map Left subnames ++ map Right subflds) rdr_ns of @@ -1350,7 +1351,7 @@ This code finds which import declarations are unused. The specification and implementation notes are here: https://gitlab.haskell.org/ghc/ghc/wikis/commentary/compiler/unused-imports -See also Note [Choosing the best import declaration] in RdrName +See also Note [Choosing the best import declaration] in GHC.Types.Name.Reader -} type ImportDeclUsage diff --git a/compiler/GHC/Rename/Pat.hs b/compiler/GHC/Rename/Pat.hs index 34450620f0..7b83b8702d 100644 --- a/compiler/GHC/Rename/Pat.hs +++ b/compiler/GHC/Rename/Pat.hs @@ -63,15 +63,15 @@ import GHC.Rename.Utils ( HsDocContext(..), newLocalBndrRn, bindLocalNames , checkTupSize , unknownSubordinateErr ) import GHC.Rename.Types import PrelNames -import Name -import NameSet -import RdrName -import BasicTypes +import GHC.Types.Name +import GHC.Types.Name.Set +import GHC.Types.Name.Reader +import GHC.Types.Basic import Util import ListSetOps ( removeDups ) import Outputable -import SrcLoc -import Literal ( inCharRange ) +import GHC.Types.SrcLoc +import GHC.Types.Literal ( inCharRange ) import TysWiredIn ( nilDataCon ) import GHC.Core.DataCon import qualified GHC.LanguageExtensions as LangExt diff --git a/compiler/GHC/Rename/Source.hs b/compiler/GHC/Rename/Source.hs index 8237e32877..fabe5b817d 100644 --- a/compiler/GHC/Rename/Source.hs +++ b/compiler/GHC/Rename/Source.hs @@ -25,8 +25,8 @@ import {-# SOURCE #-} GHC.Rename.Expr( rnLExpr ) import {-# SOURCE #-} GHC.Rename.Splice ( rnSpliceDecl, rnTopSpliceDecls ) import GHC.Hs -import FieldLabel -import RdrName +import GHC.Types.FieldLabel +import GHC.Types.Name.Reader import GHC.Rename.Types import GHC.Rename.Binds import GHC.Rename.Env @@ -41,30 +41,30 @@ import GHC.Rename.Doc ( rnHsDoc, rnMbLHsDoc ) import TcAnnotations ( annCtxt ) import TcRnMonad -import ForeignCall ( CCallTarget(..) ) -import Module -import GHC.Driver.Types ( Warnings(..), plusWarns ) +import GHC.Types.ForeignCall ( CCallTarget(..) ) +import GHC.Types.Module +import GHC.Driver.Types ( Warnings(..), plusWarns ) import PrelNames ( applicativeClassName, pureAName, thenAName , monadClassName, returnMName, thenMName , semigroupClassName, sappendName , monoidClassName, mappendName ) -import Name -import NameSet -import NameEnv -import Avail +import GHC.Types.Name +import GHC.Types.Name.Set +import GHC.Types.Name.Env +import GHC.Types.Avail import Outputable import Bag -import BasicTypes ( pprRuleName, TypeOrKind(..) ) +import GHC.Types.Basic ( pprRuleName, TypeOrKind(..) ) import FastString -import SrcLoc +import GHC.Types.SrcLoc as SrcLoc import GHC.Driver.Session import Util ( debugIsOn, filterOut, lengthExceeds, partitionWith ) -import GHC.Driver.Types ( HscEnv, hsc_dflags ) +import GHC.Driver.Types ( HscEnv, hsc_dflags ) import ListSetOps ( findDupsEq, removeDups, equivClasses ) import Digraph ( SCC, flattenSCC, flattenSCCs, Node(..) , stronglyConnCompFromEdgedVerticesUniq ) -import UniqSet +import GHC.Types.Unique.Set import OrdList import qualified GHC.LanguageExtensions as LangExt diff --git a/compiler/GHC/Rename/Splice.hs b/compiler/GHC/Rename/Splice.hs index 12496a9fb8..2275ca6ab8 100644 --- a/compiler/GHC/Rename/Splice.hs +++ b/compiler/GHC/Rename/Splice.hs @@ -16,10 +16,10 @@ module GHC.Rename.Splice ( import GhcPrelude -import Name -import NameSet +import GHC.Types.Name +import GHC.Types.Name.Set import GHC.Hs -import RdrName +import GHC.Types.Name.Reader import TcRnMonad import GHC.Rename.Env @@ -27,15 +27,15 @@ import GHC.Rename.Utils ( HsDocContext(..), newLocalBndrRn ) import GHC.Rename.Unbound ( isUnboundName ) import GHC.Rename.Source ( rnSrcDecls, findSplice ) import GHC.Rename.Pat ( rnPat ) -import BasicTypes ( TopLevelFlag, isTopLevel, SourceText(..) ) +import GHC.Types.Basic ( TopLevelFlag, isTopLevel, SourceText(..) ) import Outputable -import Module -import SrcLoc +import GHC.Types.Module +import GHC.Types.SrcLoc import GHC.Rename.Types ( rnLHsType ) import Control.Monad ( unless, when ) -import {-# SOURCE #-} GHC.Rename.Expr ( rnLExpr ) +import {-# SOURCE #-} GHC.Rename.Expr ( rnLExpr ) import TcEnv ( checkWellStaged ) import THNames ( liftName ) diff --git a/compiler/GHC/Rename/Splice.hs-boot b/compiler/GHC/Rename/Splice.hs-boot index b61a866331..f14be280fc 100644 --- a/compiler/GHC/Rename/Splice.hs-boot +++ b/compiler/GHC/Rename/Splice.hs-boot @@ -3,7 +3,7 @@ module GHC.Rename.Splice where import GhcPrelude import GHC.Hs import TcRnMonad -import NameSet +import GHC.Types.Name.Set rnSpliceType :: HsSplice GhcPs -> RnM (HsType GhcRn, FreeVars) diff --git a/compiler/GHC/Rename/Types.hs b/compiler/GHC/Rename/Types.hs index d633ac6593..23e9fe0879 100644 --- a/compiler/GHC/Rename/Types.hs +++ b/compiler/GHC/Rename/Types.hs @@ -46,17 +46,17 @@ import GHC.Rename.Utils ( HsDocContext(..), withHsDocContext, mapFvRn import GHC.Rename.Fixity ( lookupFieldFixityRn, lookupFixityRn , lookupTyFixityRn ) import TcRnMonad -import RdrName +import GHC.Types.Name.Reader import PrelNames import TysPrim ( funTyConName ) -import Name -import SrcLoc -import NameSet -import FieldLabel +import GHC.Types.Name +import GHC.Types.SrcLoc +import GHC.Types.Name.Set +import GHC.Types.FieldLabel import Util import ListSetOps ( deleteBys ) -import BasicTypes ( compareFixity, funTyFixity, negateFixity +import GHC.Types.Basic ( compareFixity, funTyFixity, negateFixity , Fixity(..), FixityDirection(..), LexicalFixity(..) , TypeOrKind(..) ) import Outputable diff --git a/compiler/GHC/Rename/Unbound.hs b/compiler/GHC/Rename/Unbound.hs index 78a49d954c..957a82e81c 100644 --- a/compiler/GHC/Rename/Unbound.hs +++ b/compiler/GHC/Rename/Unbound.hs @@ -19,12 +19,12 @@ where import GhcPrelude -import RdrName +import GHC.Types.Name.Reader import GHC.Driver.Types import TcRnMonad -import Name -import Module -import SrcLoc +import GHC.Types.Name +import GHC.Types.Module +import GHC.Types.SrcLoc as SrcLoc import Outputable import PrelNames ( mkUnboundName, isUnboundName, getUnique) import Util @@ -33,7 +33,7 @@ import GHC.Driver.Session import FastString import Data.List import Data.Function ( on ) -import UniqDFM (udfmToList) +import GHC.Types.Unique.DFM (udfmToList) {- ************************************************************************ diff --git a/compiler/GHC/Rename/Utils.hs b/compiler/GHC/Rename/Utils.hs index 45bd55b31a..32ac27d12f 100644 --- a/compiler/GHC/Rename/Utils.hs +++ b/compiler/GHC/Rename/Utils.hs @@ -36,18 +36,18 @@ where import GhcPrelude import GHC.Hs -import RdrName +import GHC.Types.Name.Reader import GHC.Driver.Types import TcEnv import TcRnMonad -import Name -import NameSet -import NameEnv +import GHC.Types.Name +import GHC.Types.Name.Set +import GHC.Types.Name.Env import GHC.Core.DataCon -import SrcLoc +import GHC.Types.SrcLoc as SrcLoc import Outputable import Util -import BasicTypes ( TopLevelFlag(..) ) +import GHC.Types.Basic ( TopLevelFlag(..) ) import ListSetOps ( removeDups ) import GHC.Driver.Session import FastString |