Modules: Types (#13009)

Update Haddock submodule

Metric Increase:
   haddock.compiler

17 files changed, 121 insertions, 121 deletions

diff --git a/compiler/GHC/Iface/Binary.hs b/compiler/GHC/Iface/Binary.hs
index c4ddfa2ece..cc8472e040 100644
--- a/compiler/GHC/Iface/Binary.hs
+++ b/compiler/GHC/Iface/Binary.hs
@@ -39,19 +39,19 @@ import TcRnMonad
 import PrelInfo   ( isKnownKeyName, lookupKnownKeyName )
 import GHC.Iface.Env
 import GHC.Driver.Types
-import Module
-import Name
+import GHC.Types.Module
+import GHC.Types.Name
 import GHC.Driver.Session
-import UniqFM
-import UniqSupply
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.Supply
 import Panic
 import Binary
-import SrcLoc
+import GHC.Types.SrcLoc
 import ErrUtils
 import FastMutInt
-import Unique
+import GHC.Types.Unique
 import Outputable
-import NameCache
+import GHC.Types.Name.Cache
 import GHC.Platform
 import FastString
 import Constants
diff --git a/compiler/GHC/Iface/Env.hs b/compiler/GHC/Iface/Env.hs
index f7cea99b94..8b12f50345 100644
--- a/compiler/GHC/Iface/Env.hs
+++ b/compiler/GHC/Iface/Env.hs
@@ -27,16 +27,16 @@ import GhcPrelude
 import TcRnMonad
 import GHC.Driver.Types
 import GHC.Core.Type
-import Var
-import Name
-import Avail
-import Module
+import GHC.Types.Var
+import GHC.Types.Name
+import GHC.Types.Avail
+import GHC.Types.Module
 import FastString
 import FastStringEnv
 import GHC.Iface.Type
-import NameCache
-import UniqSupply
-import SrcLoc
+import GHC.Types.Name.Cache
+import GHC.Types.Unique.Supply
+import GHC.Types.SrcLoc
 
 import Outputable
 import Data.List     ( partition )
@@ -48,7 +48,7 @@ import Data.List     ( partition )
 *                                                      *
 *********************************************************
 
-See Also: Note [The Name Cache] in NameCache
+See Also: Note [The Name Cache] in GHC.Types.Name.Cache
 -}
 
 newGlobalBinder :: Module -> OccName -> SrcSpan -> TcRnIf a b Name
diff --git a/compiler/GHC/Iface/Env.hs-boot b/compiler/GHC/Iface/Env.hs-boot
index 2c326ab0ad..34d9a29960 100644
--- a/compiler/GHC/Iface/Env.hs-boot
+++ b/compiler/GHC/Iface/Env.hs-boot
@@ -1,9 +1,9 @@
 module GHC.Iface.Env where
 
-import Module
-import OccName
+import GHC.Types.Module
+import GHC.Types.Name.Occurrence
 import TcRnMonad
-import Name
-import SrcLoc
+import GHC.Types.Name
+import GHC.Types.SrcLoc
 
 newGlobalBinder :: Module -> OccName -> SrcSpan -> TcRnIf a b Name
diff --git a/compiler/GHC/Iface/Ext/Ast.hs b/compiler/GHC/Iface/Ext/Ast.hs
index d726a15c7b..a1f9a3cf32 100644
--- a/compiler/GHC/Iface/Ext/Ast.hs
+++ b/compiler/GHC/Iface/Ext/Ast.hs
@@ -18,26 +18,26 @@ module GHC.Iface.Ext.Ast ( mkHieFile, mkHieFileWithSource, getCompressedAsts) wh
 
 import GhcPrelude
 
-import Avail                      ( Avails )
+import GHC.Types.Avail            ( Avails )
 import Bag                        ( Bag, bagToList )
-import BasicTypes
+import GHC.Types.Basic
 import BooleanFormula
 import GHC.Core.Class             ( FunDep )
 import GHC.Core.Utils             ( exprType )
 import GHC.Core.ConLike           ( conLikeName )
 import GHC.HsToCore               ( deSugarExpr )
-import FieldLabel
+import GHC.Types.FieldLabel
 import GHC.Hs
 import GHC.Driver.Types
-import Module                     ( ModuleName, ml_hs_file )
+import GHC.Types.Module           ( ModuleName, ml_hs_file )
 import MonadUtils                 ( concatMapM, liftIO )
-import Name                       ( Name, nameSrcSpan, setNameLoc )
-import NameEnv                    ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
-import SrcLoc
+import GHC.Types.Name             ( Name, nameSrcSpan, setNameLoc )
+import GHC.Types.Name.Env         ( NameEnv, emptyNameEnv, extendNameEnv, lookupNameEnv )
+import GHC.Types.SrcLoc
 import TcHsSyn                    ( hsLitType, hsPatType )
 import GHC.Core.Type              ( mkVisFunTys, Type )
 import TysWiredIn                 ( mkListTy, mkSumTy )
-import Var                        ( Id, Var, setVarName, varName, varType )
+import GHC.Types.Var              ( Id, Var, setVarName, varName, varType )
 import TcRnTypes
 import GHC.Iface.Make             ( mkIfaceExports )
 import Panic
diff --git a/compiler/GHC/Iface/Ext/Binary.hs b/compiler/GHC/Iface/Ext/Binary.hs
index d89a346d9f..1a231b95f7 100644
--- a/compiler/GHC/Iface/Ext/Binary.hs
+++ b/compiler/GHC/Iface/Ext/Binary.hs
@@ -23,15 +23,15 @@ import Binary
 import GHC.Iface.Binary           ( getDictFastString )
 import FastMutInt
 import FastString                 ( FastString )
-import Module                     ( Module )
-import Name
-import NameCache
+import GHC.Types.Module           ( Module )
+import GHC.Types.Name
+import GHC.Types.Name.Cache
 import Outputable
 import PrelInfo
-import SrcLoc
-import UniqSupply                 ( takeUniqFromSupply )
-import Unique
-import UniqFM
+import GHC.Types.SrcLoc as SrcLoc
+import GHC.Types.Unique.Supply    ( takeUniqFromSupply )
+import GHC.Types.Unique
+import GHC.Types.Unique.FM
 import Util
 
 import qualified Data.Array as A
diff --git a/compiler/GHC/Iface/Ext/Debug.hs b/compiler/GHC/Iface/Ext/Debug.hs
index 25cc940834..e28f7ab03d 100644
--- a/compiler/GHC/Iface/Ext/Debug.hs
+++ b/compiler/GHC/Iface/Ext/Debug.hs
@@ -9,15 +9,15 @@ module GHC.Iface.Ext.Debug where
 
 import GhcPrelude
 
-import SrcLoc
-import Module
+import GHC.Types.SrcLoc
+import GHC.Types.Module
 import FastString
 import Outputable
 
 import GHC.Iface.Ext.Types
 import GHC.Iface.Ext.Binary
 import GHC.Iface.Ext.Utils
-import Name
+import GHC.Types.Name
 
 import qualified Data.Map as M
 import qualified Data.Set as S
diff --git a/compiler/GHC/Iface/Ext/Types.hs b/compiler/GHC/Iface/Ext/Types.hs
index e56864bc04..3f87a91d34 100644
--- a/compiler/GHC/Iface/Ext/Types.hs
+++ b/compiler/GHC/Iface/Ext/Types.hs
@@ -16,11 +16,11 @@ import Config
 import Binary
 import FastString                 ( FastString )
 import GHC.Iface.Type
-import Module                     ( ModuleName, Module )
-import Name                       ( Name )
+import GHC.Types.Module           ( ModuleName, Module )
+import GHC.Types.Name             ( Name )
 import Outputable hiding ( (<>) )
-import SrcLoc                     ( RealSrcSpan )
-import Avail
+import GHC.Types.SrcLoc           ( RealSrcSpan )
+import GHC.Types.Avail
 
 import qualified Data.Array as A
 import qualified Data.Map as M
diff --git a/compiler/GHC/Iface/Ext/Utils.hs b/compiler/GHC/Iface/Ext/Utils.hs
index 2caffe56b3..bbbe1084f1 100644
--- a/compiler/GHC/Iface/Ext/Utils.hs
+++ b/compiler/GHC/Iface/Ext/Utils.hs
@@ -10,15 +10,15 @@ import GHC.Core.Map
 import GHC.Driver.Session         ( DynFlags )
 import FastString                 ( FastString, mkFastString )
 import GHC.Iface.Type
-import Name hiding (varName)
+import GHC.Types.Name hiding (varName)
 import Outputable                 ( renderWithStyle, ppr, defaultUserStyle, initSDocContext )
-import SrcLoc
+import GHC.Types.SrcLoc
 import GHC.CoreToIface
 import GHC.Core.TyCon
 import GHC.Core.TyCo.Rep
 import GHC.Core.Type
-import Var
-import VarEnv
+import GHC.Types.Var
+import GHC.Types.Var.Env
 
 import GHC.Iface.Ext.Types
 
diff --git a/compiler/GHC/Iface/Load.hs b/compiler/GHC/Iface/Load.hs
index 7858fc6ce4..9bc073b6a9 100644
--- a/compiler/GHC/Iface/Load.hs
+++ b/compiler/GHC/Iface/Load.hs
@@ -45,29 +45,29 @@ import GHC.Iface.Syntax
 import GHC.Iface.Env
 import GHC.Driver.Types
 
-import BasicTypes hiding (SuccessFlag(..))
+import GHC.Types.Basic hiding (SuccessFlag(..))
 import TcRnMonad
 
 import Constants
 import PrelNames
 import PrelInfo
 import PrimOp   ( allThePrimOps, primOpFixity, primOpOcc )
-import MkId     ( seqId )
+import GHC.Types.Id.Make ( seqId )
 import TysPrim  ( funTyConName )
 import GHC.Core.Rules
 import GHC.Core.TyCon
-import Annotations
+import GHC.Types.Annotations
 import GHC.Core.InstEnv
 import GHC.Core.FamInstEnv
-import Name
-import NameEnv
-import Avail
-import Module
+import GHC.Types.Name
+import GHC.Types.Name.Env
+import GHC.Types.Avail
+import GHC.Types.Module
 import Maybes
 import ErrUtils
 import GHC.Driver.Finder
-import UniqFM
-import SrcLoc
+import GHC.Types.Unique.FM
+import GHC.Types.SrcLoc
 import Outputable
 import GHC.Iface.Binary
 import Panic
@@ -75,9 +75,9 @@ import Util
 import FastString
 import Fingerprint
 import GHC.Driver.Hooks
-import FieldLabel
+import GHC.Types.FieldLabel
 import GHC.Iface.Rename
-import UniqDSet
+import GHC.Types.Unique.DSet
 import GHC.Driver.Plugins
 
 import Control.Monad
diff --git a/compiler/GHC/Iface/Load.hs-boot b/compiler/GHC/Iface/Load.hs-boot
index a2af2a1a9a..7718eb99f3 100644
--- a/compiler/GHC/Iface/Load.hs-boot
+++ b/compiler/GHC/Iface/Load.hs-boot
@@ -1,6 +1,6 @@
 module GHC.Iface.Load where
 
-import Module (Module)
+import GHC.Types.Module (Module)
 import TcRnMonad (IfM)
 import GHC.Driver.Types (ModIface)
 import Outputable (SDoc)
diff --git a/compiler/GHC/Iface/Make.hs b/compiler/GHC/Iface/Make.hs
index f903892f9a..5cf6aa5f27 100644
--- a/compiler/GHC/Iface/Make.hs
+++ b/compiler/GHC/Iface/Make.hs
@@ -29,8 +29,8 @@ import GHC.Iface.Load
 import GHC.CoreToIface
 
 import GHC.HsToCore.Usage ( mkUsageInfo, mkUsedNames, mkDependencies )
-import Id
-import Annotations
+import GHC.Types.Id
+import GHC.Types.Annotations
 import GHC.Core
 import GHC.Core.Class
 import GHC.Core.TyCon
@@ -45,17 +45,17 @@ import TcRnMonad
 import GHC.Hs
 import GHC.Driver.Types
 import GHC.Driver.Session
-import VarEnv
-import Var
-import Name
-import Avail
-import RdrName
-import NameEnv
-import NameSet
-import Module
+import GHC.Types.Var.Env
+import GHC.Types.Var
+import GHC.Types.Name
+import GHC.Types.Avail
+import GHC.Types.Name.Reader
+import GHC.Types.Name.Env
+import GHC.Types.Name.Set
+import GHC.Types.Module
 import ErrUtils
 import Outputable
-import BasicTypes       hiding ( SuccessFlag(..) )
+import GHC.Types.Basic  hiding ( SuccessFlag(..) )
 import Util             hiding ( eqListBy )
 import FastString
 import Maybes
@@ -228,7 +228,7 @@ mkIface_ hsc_env
           [(occ,fix) | FixItem occ fix <- nameEnvElts fix_env]
           -- The order of fixities returned from nameEnvElts is not
           -- deterministic, so we sort by OccName to canonicalize it.
-          -- See Note [Deterministic UniqFM] in UniqDFM for more details.
+          -- See Note [Deterministic UniqFM] in GHC.Types.Unique.DFM for more details.
         warns       = src_warns
         iface_rules = map coreRuleToIfaceRule rules
         iface_insts = map instanceToIfaceInst $ fixSafeInstances safe_mode insts
diff --git a/compiler/GHC/Iface/Recomp.hs b/compiler/GHC/Iface/Recomp.hs
index 0890c6ffa0..12830ab20e 100644
--- a/compiler/GHC/Iface/Recomp.hs
+++ b/compiler/GHC/Iface/Recomp.hs
@@ -19,27 +19,27 @@ import BinFingerprint
 import GHC.Iface.Load
 import FlagChecker
 
-import Annotations
+import GHC.Types.Annotations
 import GHC.Core
 import TcRnMonad
 import GHC.Hs
 import GHC.Driver.Types
 import GHC.Driver.Finder
 import GHC.Driver.Session
-import Name
-import NameSet
-import Module
+import GHC.Types.Name
+import GHC.Types.Name.Set
+import GHC.Types.Module
 import ErrUtils
 import Digraph
-import SrcLoc
+import GHC.Types.SrcLoc
 import Outputable
-import Unique
+import GHC.Types.Unique
 import Util             hiding ( eqListBy )
 import Maybes
 import Binary
 import Fingerprint
 import Exception
-import UniqSet
+import GHC.Types.Unique.Set
 import GHC.Driver.Packages
 
 import Control.Monad
diff --git a/compiler/GHC/Iface/Rename.hs b/compiler/GHC/Iface/Rename.hs
index 83632434bd..5d084155db 100644
--- a/compiler/GHC/Iface/Rename.hs
+++ b/compiler/GHC/Iface/Rename.hs
@@ -19,22 +19,22 @@ module GHC.Iface.Rename (
 
 import GhcPrelude
 
-import SrcLoc
+import GHC.Types.SrcLoc
 import Outputable
 import GHC.Driver.Types
-import Module
-import UniqFM
-import Avail
+import GHC.Types.Module
+import GHC.Types.Unique.FM
+import GHC.Types.Avail
 import GHC.Iface.Syntax
-import FieldLabel
-import Var
+import GHC.Types.FieldLabel
+import GHC.Types.Var
 import ErrUtils
 
-import Name
+import GHC.Types.Name
 import TcRnMonad
 import Util
 import Fingerprint
-import BasicTypes
+import GHC.Types.Basic
 
 -- a bit vexing
 import {-# SOURCE #-} GHC.Iface.Load
diff --git a/compiler/GHC/Iface/Syntax.hs b/compiler/GHC/Iface/Syntax.hs
index 1812c34d6b..1f82ccfc7f 100644
--- a/compiler/GHC/Iface/Syntax.hs
+++ b/compiler/GHC/Iface/Syntax.hs
@@ -47,29 +47,29 @@ import GhcPrelude
 import GHC.Iface.Type
 import BinFingerprint
 import GHC.Core( IsOrphan, isOrphan )
-import Demand
-import Cpr
+import GHC.Types.Demand
+import GHC.Types.Cpr
 import GHC.Core.Class
-import FieldLabel
-import NameSet
+import GHC.Types.FieldLabel
+import GHC.Types.Name.Set
 import GHC.Core.Coercion.Axiom ( BranchIndex )
-import Name
-import CostCentre
-import Literal
-import ForeignCall
-import Annotations( AnnPayload, AnnTarget )
-import BasicTypes
+import GHC.Types.Name
+import GHC.Types.CostCentre
+import GHC.Types.Literal
+import GHC.Types.ForeignCall
+import GHC.Types.Annotations( AnnPayload, AnnTarget )
+import GHC.Types.Basic
 import Outputable
-import Module
-import SrcLoc
+import GHC.Types.Module
+import GHC.Types.SrcLoc
 import Fingerprint
 import Binary
 import BooleanFormula ( BooleanFormula, pprBooleanFormula, isTrue )
-import Var( VarBndr(..), binderVar )
+import GHC.Types.Var( VarBndr(..), binderVar )
 import GHC.Core.TyCon ( Role (..), Injectivity(..), tyConBndrVisArgFlag )
 import Util( dropList, filterByList, notNull, unzipWith, debugIsOn )
 import GHC.Core.DataCon (SrcStrictness(..), SrcUnpackedness(..))
-import Lexeme (isLexSym)
+import GHC.Utils.Lexeme (isLexSym)
 import TysWiredIn ( constraintKindTyConName )
 import Util (seqList)
 
@@ -262,7 +262,7 @@ data IfaceConDecl
         ifConStricts :: [IfaceBang],
           -- Empty (meaning all lazy),
           -- or 1-1 corresp with arg tys
-          -- See Note [Bangs on imported data constructors] in MkId
+          -- See Note [Bangs on imported data constructors] in GHC.Types.Id.Make
         ifConSrcStricts :: [IfaceSrcBang] } -- empty meaning no src stricts
 
 type IfaceEqSpec = [(IfLclName,IfaceType)]
diff --git a/compiler/GHC/Iface/Tidy.hs b/compiler/GHC/Iface/Tidy.hs
index b3fd56c4d2..6459902a52 100644
--- a/compiler/GHC/Iface/Tidy.hs
+++ b/compiler/GHC/Iface/Tidy.hs
@@ -31,31 +31,31 @@ import GHC.Core.PatSyn
 import GHC.Core.ConLike
 import GHC.Core.Arity   ( exprArity, exprBotStrictness_maybe )
 import StaticPtrTable
-import VarEnv
-import VarSet
-import Var
-import Id
-import MkId             ( mkDictSelRhs )
-import IdInfo
+import GHC.Types.Var.Env
+import GHC.Types.Var.Set
+import GHC.Types.Var
+import GHC.Types.Id
+import GHC.Types.Id.Make ( mkDictSelRhs )
+import GHC.Types.Id.Info
 import GHC.Core.InstEnv
-import GHC.Core.Type    ( tidyTopType )
-import Demand           ( appIsBottom, isTopSig, isBottomingSig )
-import Cpr              ( mkCprSig, botCpr )
-import BasicTypes
-import Name hiding (varName)
-import NameSet
-import NameCache
-import Avail
+import GHC.Core.Type     ( tidyTopType )
+import GHC.Types.Demand  ( appIsBottom, isTopSig, isBottomingSig )
+import GHC.Types.Cpr     ( mkCprSig, botCpr )
+import GHC.Types.Basic
+import GHC.Types.Name hiding (varName)
+import GHC.Types.Name.Set
+import GHC.Types.Name.Cache
+import GHC.Types.Avail
 import GHC.Iface.Env
 import TcEnv
 import TcRnMonad
 import GHC.Core.DataCon
 import GHC.Core.TyCon
 import GHC.Core.Class
-import Module
+import GHC.Types.Module
 import GHC.Driver.Types
 import Maybes
-import UniqSupply
+import GHC.Types.Unique.Supply
 import Outputable
 import Util( filterOut )
 import qualified ErrUtils as Err
@@ -581,7 +581,7 @@ getImplicitBinds tc = cls_binds ++ getTyConImplicitBinds tc
 
 getTyConImplicitBinds :: TyCon -> [CoreBind]
 getTyConImplicitBinds tc
-  | isNewTyCon tc = []  -- See Note [Compulsory newtype unfolding] in MkId
+  | isNewTyCon tc = []  -- See Note [Compulsory newtype unfolding] in GHC.Types.Id.Make
   | otherwise     = map get_defn (mapMaybe dataConWrapId_maybe (tyConDataCons tc))
 
 getClassImplicitBinds :: Class -> [CoreBind]
diff --git a/compiler/GHC/Iface/Type.hs b/compiler/GHC/Iface/Type.hs
index 8b154248ab..85b1a19f40 100644
--- a/compiler/GHC/Iface/Type.hs
+++ b/compiler/GHC/Iface/Type.hs
@@ -68,10 +68,10 @@ import {-# SOURCE #-} GHC.Core.Type ( isRuntimeRepTy )
 
 import GHC.Core.TyCon hiding ( pprPromotionQuote )
 import GHC.Core.Coercion.Axiom
-import Var
+import GHC.Types.Var
 import PrelNames
-import Name
-import BasicTypes
+import GHC.Types.Name
+import GHC.Types.Basic
 import Binary
 import Outputable
 import FastString
@@ -119,7 +119,7 @@ ifaceBndrType (IfaceTvBndr (_, t)) = t
 type IfaceLamBndr = (IfaceBndr, IfaceOneShot)
 
 data IfaceOneShot    -- See Note [Preserve OneShotInfo] in CoreTicy
-  = IfaceNoOneShot   -- and Note [The oneShot function] in MkId
+  = IfaceNoOneShot   -- and Note [The oneShot function] in GHC.Types.Id.Make
   | IfaceOneShot
 
 
diff --git a/compiler/GHC/Iface/Type.hs-boot b/compiler/GHC/Iface/Type.hs-boot
index 30a0033c86..3876cb0618 100644
--- a/compiler/GHC/Iface/Type.hs-boot
+++ b/compiler/GHC/Iface/Type.hs-boot
@@ -4,7 +4,7 @@ module GHC.Iface.Type
    )
 where
 
-import Var (VarBndr, ArgFlag)
+import GHC.Types.Var (VarBndr, ArgFlag)
 
 data IfaceAppArgs