Modules: Driver (#13009)

submodule updates: nofib, haddock

8 files changed, 12 insertions, 12 deletions

diff --git a/compiler/coreSyn/CoreArity.hs b/compiler/coreSyn/CoreArity.hs
index 79ac6244aa..abf6642633 100644
--- a/compiler/coreSyn/CoreArity.hs
+++ b/compiler/coreSyn/CoreArity.hs
@@ -36,7 +36,7 @@ import Predicate ( isDictTy )
 import Coercion
 import BasicTypes
 import Unique
-import DynFlags ( DynFlags, GeneralFlag(..), gopt )
+import GHC.Driver.Session ( DynFlags, GeneralFlag(..), gopt )
 import Outputable
 import FastString
 import Util     ( debugIsOn )
diff --git a/compiler/coreSyn/CoreLint.hs b/compiler/coreSyn/CoreLint.hs
index aa31aed0b5..3bdd2f8fb4 100644
--- a/compiler/coreSyn/CoreLint.hs
+++ b/compiler/coreSyn/CoreLint.hs
@@ -66,8 +66,8 @@ import OptCoercion ( checkAxInstCo )
 import CoreArity ( typeArity )
 import Demand ( splitStrictSig, isBotDiv )
 
-import HscTypes
-import DynFlags
+import GHC.Driver.Types
+import GHC.Driver.Session
 import Control.Monad
 import qualified Control.Monad.Fail as MonadFail
 import MonadUtils
@@ -388,7 +388,7 @@ lintInteractiveExpr what hsc_env expr
 interactiveInScope :: HscEnv -> [Var]
 -- In GHCi we may lint expressions, or bindings arising from 'deriving'
 -- clauses, that mention variables bound in the interactive context.
--- These are Local things (see Note [Interactively-bound Ids in GHCi] in HscTypes).
+-- These are Local things (see Note [Interactively-bound Ids in GHCi] in GHC.Driver.Types).
 -- So we have to tell Lint about them, lest it reports them as out of scope.
 --
 -- We do this by find local-named things that may appear free in interactive
diff --git a/compiler/coreSyn/CoreOpt.hs b/compiler/coreSyn/CoreOpt.hs
index 1f94e5b9dc..7bb83db8b7 100644
--- a/compiler/coreSyn/CoreOpt.hs
+++ b/compiler/coreSyn/CoreOpt.hs
@@ -50,7 +50,7 @@ import PrelNames
 import BasicTypes
 import Module       ( Module )
 import ErrUtils
-import DynFlags
+import GHC.Driver.Session
 import Outputable
 import Pair
 import Util
diff --git a/compiler/coreSyn/CoreSyn.hs b/compiler/coreSyn/CoreSyn.hs
index 6758cebbee..2d4dd98cee 100644
--- a/compiler/coreSyn/CoreSyn.hs
+++ b/compiler/coreSyn/CoreSyn.hs
@@ -113,7 +113,7 @@ import Literal
 import DataCon
 import Module
 import BasicTypes
-import DynFlags
+import GHC.Driver.Session
 import Outputable
 import Util
 import UniqSet
@@ -960,7 +960,7 @@ data Tickish id =
     { breakpointId     :: !Int
     , breakpointFVs    :: [id]  -- ^ the order of this list is important:
                                 -- it matches the order of the lists in the
-                                -- appropriate entry in HscTypes.ModBreaks.
+                                -- appropriate entry in GHC.Driver.Types.ModBreaks.
                                 --
                                 -- Careful about substitution!  See
                                 -- Note [substTickish] in CoreSubst.
diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs
index 1b02878bd8..ab53451fa2 100644
--- a/compiler/coreSyn/CoreUnfold.hs
+++ b/compiler/coreSyn/CoreUnfold.hs
@@ -46,7 +46,7 @@ module CoreUnfold (
 
 import GhcPrelude
 
-import DynFlags
+import GHC.Driver.Session
 import CoreSyn
 import OccurAnal        ( occurAnalyseExpr_NoBinderSwap )
 import CoreOpt
diff --git a/compiler/coreSyn/CoreUnfold.hs-boot b/compiler/coreSyn/CoreUnfold.hs-boot
index 9f298f7d9d..cee6658df2 100644
--- a/compiler/coreSyn/CoreUnfold.hs-boot
+++ b/compiler/coreSyn/CoreUnfold.hs-boot
@@ -4,7 +4,7 @@ module CoreUnfold (
 
 import GhcPrelude
 import CoreSyn
-import DynFlags
+import GHC.Driver.Session
 
 mkInlineUnfolding :: CoreExpr -> Unfolding
 
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index cde9dc0e45..7133567068 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -87,7 +87,7 @@ import TyCon
 import Unique
 import Outputable
 import TysPrim
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import Maybes
 import ListSetOps       ( minusList )
diff --git a/compiler/coreSyn/MkCore.hs b/compiler/coreSyn/MkCore.hs
index e21d980775..d8b3b7a75d 100644
--- a/compiler/coreSyn/MkCore.hs
+++ b/compiler/coreSyn/MkCore.hs
@@ -62,7 +62,7 @@ import Var      ( EvVar, setTyVarUnique )
 import CoreSyn
 import CoreUtils        ( exprType, needsCaseBinding, mkSingleAltCase, bindNonRec )
 import Literal
-import HscTypes
+import GHC.Driver.Types
 
 import TysWiredIn
 import PrelNames
@@ -81,7 +81,7 @@ import FastString
 import UniqSupply
 import BasicTypes
 import Util
-import DynFlags
+import GHC.Driver.Session
 import Data.List
 
 import Data.Char        ( ord )