Modules: Driver (#13009)

submodule updates: nofib, haddock

7 files changed, 23 insertions, 23 deletions

diff --git a/compiler/GHC/Runtime/Debugger.hs b/compiler/GHC/Runtime/Debugger.hs
index 9443ff9421..177a83ea8b 100644
--- a/compiler/GHC/Runtime/Debugger.hs
+++ b/compiler/GHC/Runtime/Debugger.hs
@@ -21,8 +21,8 @@ import GHC.Runtime.Heap.Inspect
 
 import GHC.Runtime.Interpreter
 import GHCi.RemoteTypes
-import GhcMonad
-import HscTypes
+import GHC.Driver.Monad
+import GHC.Driver.Types
 import Id
 import GHC.Iface.Syntax ( showToHeader )
 import GHC.Iface.Env    ( newInteractiveBinder )
@@ -36,7 +36,7 @@ import Outputable
 import PprTyThing
 import ErrUtils
 import MonadUtils
-import DynFlags
+import GHC.Driver.Session
 import Exception
 
 import Control.Monad
diff --git a/compiler/GHC/Runtime/Eval.hs b/compiler/GHC/Runtime/Eval.hs
index 666b80cc88..c960b1c8c6 100644
--- a/compiler/GHC/Runtime/Eval.hs
+++ b/compiler/GHC/Runtime/Eval.hs
@@ -53,10 +53,10 @@ import GHC.Runtime.Eval.Types
 import GHC.Runtime.Interpreter as GHCi
 import GHCi.Message
 import GHCi.RemoteTypes
-import GhcMonad
-import HscMain
+import GHC.Driver.Monad
+import GHC.Driver.Main
 import GHC.Hs
-import HscTypes
+import GHC.Driver.Types
 import InstEnv
 import GHC.Iface.Env   ( newInteractiveBinder )
 import FamInstEnv      ( FamInst )
@@ -77,7 +77,7 @@ import RdrName
 import VarEnv
 import GHC.ByteCode.Types
 import GHC.Runtime.Linker as Linker
-import DynFlags
+import GHC.Driver.Session
 import Unique
 import UniqSupply
 import MonadUtils
diff --git a/compiler/GHC/Runtime/Heap/Inspect.hs b/compiler/GHC/Runtime/Heap/Inspect.hs
index de6f9a7af3..7842afcc5d 100644
--- a/compiler/GHC/Runtime/Heap/Inspect.hs
+++ b/compiler/GHC/Runtime/Heap/Inspect.hs
@@ -29,7 +29,7 @@ import GhcPrelude
 
 import GHC.Runtime.Interpreter as GHCi
 import GHCi.RemoteTypes
-import HscTypes
+import GHC.Driver.Types
 
 import DataCon
 import Type
@@ -54,7 +54,7 @@ import BasicTypes       ( Boxity(..) )
 import TysPrim
 import PrelNames
 import TysWiredIn
-import DynFlags
+import GHC.Driver.Session
 import Outputable as Ppr
 import GHC.Char
 import GHC.Exts.Heap
diff --git a/compiler/GHC/Runtime/Heap/Layout.hs b/compiler/GHC/Runtime/Heap/Layout.hs
index b7899ecc1b..8ef91ae741 100644
--- a/compiler/GHC/Runtime/Heap/Layout.hs
+++ b/compiler/GHC/Runtime/Heap/Layout.hs
@@ -47,7 +47,7 @@ module GHC.Runtime.Heap.Layout (
 import GhcPrelude
 
 import BasicTypes( ConTagZ )
-import DynFlags
+import GHC.Driver.Session
 import Outputable
 import GHC.Platform
 import FastString
diff --git a/compiler/GHC/Runtime/Interpreter.hs b/compiler/GHC/Runtime/Interpreter.hs
index 9eadacca1c..8524e92cdc 100644
--- a/compiler/GHC/Runtime/Interpreter.hs
+++ b/compiler/GHC/Runtime/Interpreter.hs
@@ -58,17 +58,17 @@ import GHCi.RemoteTypes
 import GHCi.ResolvedBCO
 import GHCi.BreakArray (BreakArray)
 import Fingerprint
-import HscTypes
+import GHC.Driver.Types
 import UniqFM
 import Panic
-import DynFlags
+import GHC.Driver.Session
 import ErrUtils
 import Outputable
 import Exception
 import BasicTypes
 import FastString
 import Util
-import Hooks
+import GHC.Driver.Hooks
 
 import Control.Concurrent
 import Control.Monad
diff --git a/compiler/GHC/Runtime/Linker.hs b/compiler/GHC/Runtime/Linker.hs
index fb409bd75b..3dcdce34d1 100644
--- a/compiler/GHC/Runtime/Linker.hs
+++ b/compiler/GHC/Runtime/Linker.hs
@@ -38,16 +38,16 @@ import GHC.ByteCode.Linker
 import GHC.ByteCode.Asm
 import GHC.ByteCode.Types
 import TcRnMonad
-import Packages
-import DriverPhases
-import Finder
-import HscTypes
+import GHC.Driver.Packages as Packages
+import GHC.Driver.Phases
+import GHC.Driver.Finder
+import GHC.Driver.Types
 import Name
 import NameEnv
 import Module
 import ListSetOps
 import GHC.Runtime.Linker.Types (DynLinker(..), LinkerUnitId, PersistentLinkerState(..))
-import DynFlags
+import GHC.Driver.Session
 import BasicTypes
 import Outputable
 import Panic
diff --git a/compiler/GHC/Runtime/Loader.hs b/compiler/GHC/Runtime/Loader.hs
index 0156b16044..15d0b7d5dc 100644
--- a/compiler/GHC/Runtime/Loader.hs
+++ b/compiler/GHC/Runtime/Loader.hs
@@ -21,12 +21,12 @@ module GHC.Runtime.Loader (
     ) where
 
 import GhcPrelude
-import DynFlags
+import GHC.Driver.Session
 
 import GHC.Runtime.Linker      ( linkModule, getHValue )
 import GHC.Runtime.Interpreter ( wormhole )
 import SrcLoc           ( noSrcSpan )
-import Finder           ( findPluginModule, cannotFindModule )
+import GHC.Driver.Finder           ( findPluginModule, cannotFindModule )
 import TcRnMonad        ( initTcInteractive, initIfaceTcRn )
 import GHC.Iface.Load   ( loadPluginInterface )
 import RdrName          ( RdrName, ImportSpec(..), ImpDeclSpec(..)
@@ -34,10 +34,10 @@ import RdrName          ( RdrName, ImportSpec(..), ImpDeclSpec(..)
                         , gre_name, mkRdrQual )
 import OccName          ( OccName, mkVarOcc )
 import GHC.Rename.Names ( gresFromAvails )
-import Plugins
+import GHC.Driver.Plugins
 import PrelNames        ( pluginTyConName, frontendPluginTyConName )
 
-import HscTypes
+import GHC.Driver.Types
 import GHCi.RemoteTypes ( HValue )
 import Type             ( Type, eqType, mkTyConTy )
 import TyCoPpr          ( pprTyThingCategory )
@@ -50,7 +50,7 @@ import FastString
 import ErrUtils
 import Outputable
 import Exception
-import Hooks
+import GHC.Driver.Hooks
 
 import Control.Monad     ( when, unless )
 import Data.Maybe        ( mapMaybe )