Modules: Types (#13009)

Update Haddock submodule

Metric Increase:
   haddock.compiler

16 files changed, 78 insertions, 78 deletions

diff --git a/compiler/GHC/Driver/Backpack.hs b/compiler/GHC/Driver/Backpack.hs
index a82c9c562f..61cac8bb40 100644
--- a/compiler/GHC/Driver/Backpack.hs
+++ b/compiler/GHC/Driver/Backpack.hs
@@ -32,23 +32,23 @@ import GHC.Driver.Monad
 import GHC.Driver.Session
 import TcRnMonad
 import TcRnDriver
-import Module
+import GHC.Types.Module
 import GHC.Driver.Types
 import StringBuffer
 import FastString
 import ErrUtils
-import SrcLoc
+import GHC.Types.SrcLoc
 import GHC.Driver.Main
-import UniqFM
-import UniqDFM
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.DFM
 import Outputable
 import Maybes
 import HeaderInfo
 import GHC.Iface.Recomp
 import GHC.Driver.Make
-import UniqDSet
+import GHC.Types.Unique.DSet
 import PrelNames
-import BasicTypes hiding (SuccessFlag(..))
+import GHC.Types.Basic hiding (SuccessFlag(..))
 import GHC.Driver.Finder
 import Util
 
diff --git a/compiler/GHC/Driver/Backpack/Syntax.hs b/compiler/GHC/Driver/Backpack/Syntax.hs
index 709427ebd0..7a119907da 100644
--- a/compiler/GHC/Driver/Backpack/Syntax.hs
+++ b/compiler/GHC/Driver/Backpack/Syntax.hs
@@ -20,9 +20,9 @@ import GhcPrelude
 
 import GHC.Driver.Phases
 import GHC.Hs
-import SrcLoc
+import GHC.Types.SrcLoc
 import Outputable
-import Module
+import GHC.Types.Module
 import UnitInfo
 
 {-
diff --git a/compiler/GHC/Driver/CmdLine.hs b/compiler/GHC/Driver/CmdLine.hs
index 9b71e3d3fb..243831cfc5 100644
--- a/compiler/GHC/Driver/CmdLine.hs
+++ b/compiler/GHC/Driver/CmdLine.hs
@@ -32,7 +32,7 @@ import Util
 import Outputable
 import Panic
 import Bag
-import SrcLoc
+import GHC.Types.SrcLoc
 import Json
 
 import Data.Function
diff --git a/compiler/GHC/Driver/CodeOutput.hs b/compiler/GHC/Driver/CodeOutput.hs
index 507311c039..45c40d2c30 100644
--- a/compiler/GHC/Driver/CodeOutput.hs
+++ b/compiler/GHC/Driver/CodeOutput.hs
@@ -15,7 +15,7 @@ import GhcPrelude
 import GHC.CmmToAsm     ( nativeCodeGen )
 import GHC.CmmToLlvm    ( llvmCodeGen )
 
-import UniqSupply       ( mkSplitUniqSupply )
+import GHC.Types.Unique.Supply ( mkSplitUniqSupply )
 
 import GHC.Driver.Finder    ( mkStubPaths )
 import GHC.CmmToC           ( writeC )
@@ -30,8 +30,8 @@ import FileCleanup
 
 import ErrUtils
 import Outputable
-import Module
-import SrcLoc
+import GHC.Types.Module
+import GHC.Types.SrcLoc
 
 import Control.Exception
 import System.Directory
diff --git a/compiler/GHC/Driver/Finder.hs b/compiler/GHC/Driver/Finder.hs
index c7c9c1af1f..a9f0fda13e 100644
--- a/compiler/GHC/Driver/Finder.hs
+++ b/compiler/GHC/Driver/Finder.hs
@@ -35,7 +35,7 @@ module GHC.Driver.Finder (
 
 import GhcPrelude
 
-import Module
+import GHC.Types.Module
 import GHC.Driver.Types
 import GHC.Driver.Packages
 import FastString
diff --git a/compiler/GHC/Driver/Hooks.hs b/compiler/GHC/Driver/Hooks.hs
index 0fbb10bb89..51ea03dac1 100644
--- a/compiler/GHC/Driver/Hooks.hs
+++ b/compiler/GHC/Driver/Hooks.hs
@@ -39,18 +39,18 @@ import GHC.Hs.Expr
 import OrdList
 import TcRnTypes
 import Bag
-import RdrName
-import Name
-import Id
+import GHC.Types.Name.Reader
+import GHC.Types.Name
+import GHC.Types.Id
 import GHC.Core
 import GHCi.RemoteTypes
-import SrcLoc
+import GHC.Types.SrcLoc
 import GHC.Core.Type
 import System.Process
-import BasicTypes
-import Module
+import GHC.Types.Basic
+import GHC.Types.Module
 import GHC.Core.TyCon
-import CostCentre
+import GHC.Types.CostCentre
 import GHC.Stg.Syntax
 import Stream
 import GHC.Cmm
diff --git a/compiler/GHC/Driver/Main.hs b/compiler/GHC/Driver/Main.hs
index 083bfd279a..1b35e34aff 100644
--- a/compiler/GHC/Driver/Main.hs
+++ b/compiler/GHC/Driver/Main.hs
@@ -88,7 +88,7 @@ import GhcPrelude
 
 import Data.Data hiding (Fixity, TyCon)
 import Data.Maybe       ( fromJust )
-import Id
+import GHC.Types.Id
 import GHC.Runtime.Interpreter ( addSptEntry )
 import GHCi.RemoteTypes        ( ForeignHValue )
 import GHC.CoreToByteCode      ( byteCodeGen, coreExprToBCOs )
@@ -96,26 +96,26 @@ import GHC.Runtime.Linker
 import GHC.Core.Op.Tidy        ( tidyExpr )
 import GHC.Core.Type           ( Type, Kind )
 import GHC.Core.Lint           ( lintInteractiveExpr )
-import VarEnv                  ( emptyTidyEnv )
+import GHC.Types.Var.Env       ( emptyTidyEnv )
 import Panic
 import GHC.Core.ConLike
 
 import ApiAnnotation
-import Module
+import GHC.Types.Module
 import GHC.Driver.Packages
-import RdrName
+import GHC.Types.Name.Reader
 import GHC.Hs
 import GHC.Hs.Dump
 import GHC.Core
 import StringBuffer
 import Parser
 import Lexer
-import SrcLoc
+import GHC.Types.SrcLoc
 import TcRnDriver
 import GHC.IfaceToCore  ( typecheckIface )
 import TcRnMonad
 import TcHsSyn          ( ZonkFlexi (DefaultFlexi) )
-import NameCache        ( initNameCache )
+import GHC.Types.Name.Cache ( initNameCache )
 import PrelInfo
 import GHC.Core.Op.Simplify.Driver
 import GHC.HsToCore
@@ -129,11 +129,11 @@ import GHC.Stg.Syntax
 import GHC.Stg.FVs      ( annTopBindingsFreeVars )
 import GHC.Stg.Pipeline ( stg2stg )
 import qualified GHC.StgToCmm as StgToCmm ( codeGen )
-import CostCentre
-import ProfInit
+import GHC.Types.CostCentre
+import GHC.Types.CostCentre.Init
 import GHC.Core.TyCon
-import Name
-import NameSet
+import GHC.Types.Name
+import GHC.Types.Name.Set
 import GHC.Cmm
 import GHC.Cmm.Parser         ( parseCmmFile )
 import GHC.Cmm.Info.Build
@@ -153,11 +153,11 @@ import GHC.Driver.Session
 import ErrUtils
 
 import Outputable
-import NameEnv
+import GHC.Types.Name.Env
 import HscStats         ( ppSourceStats )
 import GHC.Driver.Types
 import FastString
-import UniqSupply
+import GHC.Types.Unique.Supply
 import Bag
 import Exception
 import qualified Stream
diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs
index e1aa392771..051e9d56ce 100644
--- a/compiler/GHC/Driver/Make.hs
+++ b/compiler/GHC/Driver/Make.hs
@@ -45,31 +45,31 @@ import GHC.Driver.Finder
 import GHC.Driver.Monad
 import HeaderInfo
 import GHC.Driver.Types
-import Module
+import GHC.Types.Module
 import GHC.IfaceToCore  ( typecheckIface )
 import TcRnMonad        ( initIfaceCheck )
 import GHC.Driver.Main
 
 import Bag              ( unitBag, listToBag, unionManyBags, isEmptyBag )
-import BasicTypes
+import GHC.Types.Basic
 import Digraph
 import Exception        ( tryIO, gbracket, gfinally )
 import FastString
 import Maybes           ( expectJust )
-import Name
+import GHC.Types.Name
 import MonadUtils       ( allM )
 import Outputable
 import Panic
-import SrcLoc
+import GHC.Types.SrcLoc
 import StringBuffer
-import UniqFM
-import UniqDSet
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.DSet
 import TcBackpack
 import GHC.Driver.Packages
-import UniqSet
+import GHC.Types.Unique.Set
 import Util
 import qualified GHC.LanguageExtensions as LangExt
-import NameEnv
+import GHC.Types.Name.Env
 import FileCleanup
 
 import Data.Either ( rights, partitionEithers )
diff --git a/compiler/GHC/Driver/MakeFile.hs b/compiler/GHC/Driver/MakeFile.hs
index 7b621ca3c4..385b1de791 100644
--- a/compiler/GHC/Driver/MakeFile.hs
+++ b/compiler/GHC/Driver/MakeFile.hs
@@ -24,12 +24,12 @@ import GHC.Driver.Ways
 import Util
 import GHC.Driver.Types
 import qualified SysTools
-import Module
+import GHC.Types.Module
 import Digraph          ( SCC(..) )
 import GHC.Driver.Finder
 import Outputable
 import Panic
-import SrcLoc
+import GHC.Types.SrcLoc
 import Data.List
 import FastString
 import FileCleanup
diff --git a/compiler/GHC/Driver/Packages.hs b/compiler/GHC/Driver/Packages.hs
index e8bed631ff..1f61d5df97 100644
--- a/compiler/GHC/Driver/Packages.hs
+++ b/compiler/GHC/Driver/Packages.hs
@@ -72,11 +72,11 @@ import GHC.PackageDb
 import UnitInfo
 import GHC.Driver.Session
 import GHC.Driver.Ways
-import Name             ( Name, nameModule_maybe )
-import UniqFM
-import UniqDFM
-import UniqSet
-import Module
+import GHC.Types.Name       ( Name, nameModule_maybe )
+import GHC.Types.Unique.FM
+import GHC.Types.Unique.DFM
+import GHC.Types.Unique.Set
+import GHC.Types.Module
 import Util
 import Panic
 import GHC.Platform
@@ -995,7 +995,7 @@ pprTrustFlag flag = case flag of
 -- -----------------------------------------------------------------------------
 -- Wired-in packages
 --
--- See Note [Wired-in packages] in Module
+-- See Note [Wired-in packages] in GHC.Types.Module
 
 type WiredInUnitId = String
 type WiredPackagesMap = Map WiredUnitId WiredUnitId
@@ -1015,7 +1015,7 @@ findWiredInPackages
 findWiredInPackages dflags prec_map pkgs vis_map = do
   -- Now we must find our wired-in packages, and rename them to
   -- their canonical names (eg. base-1.0 ==> base), as described
-  -- in Note [Wired-in packages] in Module
+  -- in Note [Wired-in packages] in GHC.Types.Module
   let
         matches :: UnitInfo -> WiredInUnitId -> Bool
         pc `matches` pid
@@ -1119,7 +1119,7 @@ findWiredInPackages dflags prec_map pkgs vis_map = do
 
 -- Helper functions for rewiring Module and UnitId.  These
 -- rewrite UnitIds of modules in wired-in packages to the form known to the
--- compiler, as described in Note [Wired-in packages] in Module.
+-- compiler, as described in Note [Wired-in packages] in GHC.Types.Module.
 --
 -- For instance, base-4.9.0.0 will be rewritten to just base, to match
 -- what appears in PrelNames.
diff --git a/compiler/GHC/Driver/Packages.hs-boot b/compiler/GHC/Driver/Packages.hs-boot
index 89fb2a1c18..73823c0d3b 100644
--- a/compiler/GHC/Driver/Packages.hs-boot
+++ b/compiler/GHC/Driver/Packages.hs-boot
@@ -1,7 +1,7 @@
 module GHC.Driver.Packages where
 import GhcPrelude
 import {-# SOURCE #-} GHC.Driver.Session (DynFlags)
-import {-# SOURCE #-} Module(ComponentId, UnitId, InstalledUnitId)
+import {-# SOURCE #-} GHC.Types.Module(ComponentId, UnitId, InstalledUnitId)
 data PackageState
 data UnitInfoMap
 data PackageDatabase
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs
index 627efeeb41..01e89b5fbe 100644
--- a/compiler/GHC/Driver/Pipeline.hs
+++ b/compiler/GHC/Driver/Pipeline.hs
@@ -49,15 +49,15 @@ import GHC.Driver.Main
 import GHC.Driver.Finder
 import GHC.Driver.Types hiding ( Hsc )
 import Outputable
-import Module
+import GHC.Types.Module
 import ErrUtils
 import GHC.Driver.Session
 import Panic
 import Util
 import StringBuffer     ( hGetStringBuffer, hPutStringBuffer )
-import BasicTypes       ( SuccessFlag(..) )
+import GHC.Types.Basic  ( SuccessFlag(..) )
 import Maybes           ( expectJust )
-import SrcLoc
+import GHC.Types.SrcLoc
 import GHC.CmmToLlvm    ( llvmFixupAsm, llvmVersionList )
 import MonadUtils
 import GHC.Platform
@@ -69,7 +69,7 @@ import FileCleanup
 import Ar
 import Bag              ( unitBag )
 import FastString       ( mkFastString )
-import GHC.Iface.Make  ( mkFullIface )
+import GHC.Iface.Make   ( mkFullIface )
 import UpdateCafInfos   ( updateModDetailsCafInfos )
 
 import Exception
diff --git a/compiler/GHC/Driver/Pipeline/Monad.hs b/compiler/GHC/Driver/Pipeline/Monad.hs
index 5831f923ea..6e07924d1e 100644
--- a/compiler/GHC/Driver/Pipeline/Monad.hs
+++ b/compiler/GHC/Driver/Pipeline/Monad.hs
@@ -18,7 +18,7 @@ import Outputable
 import GHC.Driver.Session
 import GHC.Driver.Phases
 import GHC.Driver.Types
-import Module
+import GHC.Types.Module
 import FileCleanup (TempFileLifetime)
 
 import Control.Monad
diff --git a/compiler/GHC/Driver/Plugins.hs b/compiler/GHC/Driver/Plugins.hs
index 437e68af71..bf2e9fe759 100644
--- a/compiler/GHC/Driver/Plugins.hs
+++ b/compiler/GHC/Driver/Plugins.hs
@@ -58,7 +58,7 @@ import GHC.Driver.Session
 import GHC.Driver.Types
 import GHC.Driver.Monad
 import GHC.Driver.Phases
-import Module ( ModuleName, Module(moduleName))
+import GHC.Types.Module ( ModuleName, Module(moduleName))
 import Fingerprint
 import Data.List (sort)
 import Outputable (Outputable(..), text, (<+>))
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
index d511701ea1..56d53838f6 100644
--- a/compiler/GHC/Driver/Session.hs
+++ b/compiler/GHC/Driver/Session.hs
@@ -243,7 +243,7 @@ import GhcPrelude
 import GHC.Platform
 import GHC.UniqueSubdir (uniqueSubdir)
 import PlatformConstants
-import Module
+import GHC.Types.Module
 import {-# SOURCE #-} GHC.Driver.Plugins
 import {-# SOURCE #-} GHC.Driver.Hooks
 import {-# SOURCE #-} PrelNames ( mAIN )
@@ -263,8 +263,8 @@ import Util
 import Maybes
 import MonadUtils
 import qualified Pretty
-import SrcLoc
-import BasicTypes       ( Alignment, alignmentOf, IntWithInf, treatZeroAsInf )
+import GHC.Types.SrcLoc
+import GHC.Types.Basic ( Alignment, alignmentOf, IntWithInf, treatZeroAsInf )
 import FastString
 import Fingerprint
 import FileSettings
diff --git a/compiler/GHC/Driver/Types.hs b/compiler/GHC/Driver/Types.hs
index c2699f23e9..64e031e0f5 100644
--- a/compiler/GHC/Driver/Types.hs
+++ b/compiler/GHC/Driver/Types.hs
@@ -159,24 +159,24 @@ import GHC.Runtime.Eval.Types ( Resume )
 import GHC.Runtime.Interpreter.Types (Interp)
 import GHC.ForeignSrcLang
 
-import UniqFM
+import GHC.Types.Unique.FM
 import GHC.Hs
-import RdrName
-import Avail
-import Module
+import GHC.Types.Name.Reader
+import GHC.Types.Avail
+import GHC.Types.Module
 import GHC.Core.InstEnv ( InstEnv, ClsInst, identicalClsInstHead )
 import GHC.Core.FamInstEnv
 import GHC.Core         ( CoreProgram, RuleBase, CoreRule )
-import Name
-import NameEnv
-import VarSet
-import Var
-import Id
-import IdInfo           ( IdDetails(..), RecSelParent(..))
+import GHC.Types.Name
+import GHC.Types.Name.Env
+import GHC.Types.Var.Set
+import GHC.Types.Var
+import GHC.Types.Id
+import GHC.Types.Id.Info ( IdDetails(..), RecSelParent(..))
 import GHC.Core.Type
 
 import ApiAnnotation    ( ApiAnns )
-import Annotations      ( Annotation, AnnEnv, mkAnnEnv, plusAnnEnv )
+import GHC.Types.Annotations ( Annotation, AnnEnv, mkAnnEnv, plusAnnEnv )
 import GHC.Core.Class
 import GHC.Core.TyCon
 import GHC.Core.Coercion.Axiom
@@ -193,13 +193,13 @@ import GHC.Driver.Phases
    ( Phase, HscSource(..), hscSourceString
    , isHsBootOrSig, isHsigFile )
 import qualified GHC.Driver.Phases as Phase
-import BasicTypes
+import GHC.Types.Basic
 import GHC.Iface.Syntax
 import Maybes
 import Outputable
-import SrcLoc
-import Unique
-import UniqDFM
+import GHC.Types.SrcLoc
+import GHC.Types.Unique
+import GHC.Types.Unique.DFM
 import FastString
 import StringBuffer     ( StringBuffer )
 import Fingerprint
@@ -207,10 +207,10 @@ import MonadUtils
 import Bag
 import Binary
 import ErrUtils
-import NameCache
+import GHC.Types.Name.Cache
 import GHC.Platform
 import Util
-import UniqDSet
+import GHC.Types.Unique.DSet
 import GHC.Serialized   ( Serialized )
 import qualified GHC.LanguageExtensions as LangExt
 
@@ -1611,7 +1611,7 @@ The Ids bound by previous Stmts in GHCi are currently
      global.
 
  (b) Having an External Name is important because of Note
-     [GlobalRdrEnv shadowing] in RdrName
+     [GlobalRdrEnv shadowing] in GHC.Types.Names.RdrName
 
  (c) Their types are tidied. This is important, because :info may ask
      to look at them, and :info expects the things it looks up to have