Modules: Types (#13009)

Update Haddock submodule

Metric Increase:
   haddock.compiler

6 files changed, 22 insertions, 23 deletions

diff --git a/ghc/GHCi/Leak.hs b/ghc/GHCi/Leak.hs
index 61a12c9a9b..5dcd9ab80d 100644
--- a/ghc/GHCi/Leak.hs
+++ b/ghc/GHCi/Leak.hs
@@ -17,7 +17,7 @@ import GHC.Platform (target32Bit)
 import Prelude
 import System.Mem
 import System.Mem.Weak
-import UniqDFM
+import GHC.Types.Unique.DFM
 
 -- Checking for space leaks in GHCi. See #15111, and the
 -- -fghci-leak-check flag.
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index 67903c80bf..ec70fc037d 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -55,15 +55,15 @@ import GHC.Hs
 import GHC.Driver.Types ( tyThingParent_maybe, handleFlagWarnings, getSafeMode, hsc_IC,
                   setInteractivePrintName, hsc_dflags, msObjFilePath, runInteractiveHsc,
                   hsc_dynLinker, hsc_interp )
-import Module
-import Name
+import GHC.Types.Module
+import GHC.Types.Name
 import GHC.Driver.Packages ( trusted, getPackageDetails, getInstalledPackageDetails,
                              listVisibleModuleNames, pprFlag )
 import GHC.Iface.Syntax ( showToHeader )
 import GHC.Core.Ppr.TyThing
 import PrelNames
-import RdrName ( getGRE_NameQualifier_maybes, getRdrName )
-import SrcLoc
+import GHC.Types.Name.Reader as RdrName ( getGRE_NameQualifier_maybes, getRdrName )
+import GHC.Types.SrcLoc as SrcLoc
 import qualified Lexer
 
 import StringBuffer
@@ -72,14 +72,14 @@ import Outputable hiding ( printForUser, printForUserPartWay )
 import GHC.Runtime.Loader ( initializePlugins )
 
 -- Other random utilities
-import BasicTypes hiding ( isTopLevel )
+import GHC.Types.Basic hiding ( isTopLevel )
 import Config
 import Digraph
 import Encoding
 import FastString
 import GHC.Runtime.Linker
 import Maybes ( orElse, expectJust )
-import NameSet
+import GHC.Types.Name.Set
 import Panic hiding ( showException )
 import Util
 import qualified GHC.LanguageExtensions as LangExt
diff --git a/ghc/GHCi/UI/Info.hs b/ghc/GHCi/UI/Info.hs
index 290a11ff2a..bf941a208d 100644
--- a/ghc/GHCi/UI/Info.hs
+++ b/ghc/GHCi/UI/Info.hs
@@ -37,12 +37,12 @@ import           GHC.Driver.Session (HasDynFlags(..))
 import           FastString
 import           GHC
 import           GHC.Driver.Monad
-import           Name
-import           NameSet
+import           GHC.Types.Name
+import           GHC.Types.Name.Set
 import           Outputable
-import           SrcLoc
+import           GHC.Types.SrcLoc
 import           TcHsSyn
-import           Var
+import           GHC.Types.Var
 
 -- | Info about a module. This information is generated every time a
 -- module is loaded.
diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs
index 675b92babe..94d5b8bf91 100644
--- a/ghc/GHCi/UI/Monad.hs
+++ b/ghc/GHCi/UI/Monad.hs
@@ -40,13 +40,13 @@ import qualified GHC
 import GHC.Driver.Monad hiding (liftIO)
 import Outputable       hiding (printForUser, printForUserPartWay)
 import qualified Outputable
-import OccName
+import GHC.Types.Name.Occurrence
 import GHC.Driver.Session
 import FastString
 import GHC.Driver.Types
-import SrcLoc
-import Module
-import RdrName (mkOrig)
+import GHC.Types.SrcLoc
+import GHC.Types.Module
+import GHC.Types.Name.Reader as RdrName (mkOrig)
 import PrelNames (gHC_GHCI_HELPERS)
 import GHC.Runtime.Interpreter
 import GHCi.RemoteTypes
diff --git a/ghc/GHCi/UI/Tags.hs b/ghc/GHCi/UI/Tags.hs
index 8ab9a3b438..155a63bf5a 100644
--- a/ghc/GHCi/UI/Tags.hs
+++ b/ghc/GHCi/UI/Tags.hs
@@ -20,8 +20,8 @@ import Outputable
 
 -- ToDo: figure out whether we need these, and put something appropriate
 -- into the GHC API instead
-import Name (nameOccName)
-import OccName (pprOccName)
+import GHC.Types.Name (nameOccName)
+import GHC.Types.Name.Occurrence (pprOccName)
 import GHC.Core.ConLike
 import MonadUtils
 
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 1ad2a26e86..3cec5b6191 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -39,7 +39,7 @@ import GHC.Driver.Plugins
 #if defined(HAVE_INTERNAL_INTERPRETER)
 import GHC.Runtime.Loader   ( initializePlugins )
 #endif
-import Module           ( ModuleName )
+import GHC.Types.Module     ( ModuleName, mkModuleName )
 
 
 -- Various other random stuff that we need
@@ -51,22 +51,21 @@ import Constants
 import GHC.Driver.Types
 import GHC.Driver.Packages ( pprPackages, pprPackagesSimple )
 import GHC.Driver.Phases
-import BasicTypes       ( failed )
+import GHC.Types.Basic     ( failed )
 import GHC.Driver.Session hiding (WarnReason(..))
 import ErrUtils
 import FastString
 import Outputable
 import SysTools.BaseDir
 import SysTools.Settings
-import SrcLoc
+import GHC.Types.SrcLoc
 import Util
 import Panic
-import UniqSupply
+import GHC.Types.Unique.Supply
 import MonadUtils       ( liftIO )
 
 -- Imports for --abi-hash
-import GHC.Iface.Load           ( loadUserInterface )
-import Module              ( mkModuleName )
+import GHC.Iface.Load      ( loadUserInterface )
 import GHC.Driver.Finder   ( findImportedModule, cannotFindModule )
 import TcRnMonad           ( initIfaceCheck )
 import Binary              ( openBinMem, put_ )