Modules: Driver (#13009)

submodule updates: nofib, haddock

23 files changed, 31 insertions, 31 deletions

diff --git a/testsuite/tests/ghc-api/T10508_api.hs b/testsuite/tests/ghc-api/T10508_api.hs
index d0b8b0a946..f2f5574222 100644
--- a/testsuite/tests/ghc-api/T10508_api.hs
+++ b/testsuite/tests/ghc-api/T10508_api.hs
@@ -1,6 +1,6 @@
 module Main where
 
-import DynFlags
+import GHC.Driver.Session
 import GHC
 import qualified GHC.LanguageExtensions as LangExt
 
diff --git a/testsuite/tests/ghc-api/T10942.hs b/testsuite/tests/ghc-api/T10942.hs
index 6fbf1d5bd3..53528ad718 100644
--- a/testsuite/tests/ghc-api/T10942.hs
+++ b/testsuite/tests/ghc-api/T10942.hs
@@ -1,6 +1,6 @@
 module Main where
 
-import DynFlags
+import GHC.Driver.Session
 import GHC
 
 import Control.Monad.IO.Class (liftIO)
diff --git a/testsuite/tests/ghc-api/T11579.hs b/testsuite/tests/ghc-api/T11579.hs
index 3294f999f2..493823b843 100644
--- a/testsuite/tests/ghc-api/T11579.hs
+++ b/testsuite/tests/ghc-api/T11579.hs
@@ -1,5 +1,5 @@
 import System.Environment
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import GHC
 import StringBuffer
diff --git a/testsuite/tests/ghc-api/T12099.hs b/testsuite/tests/ghc-api/T12099.hs
index ba254cfd13..e9fe77d6e2 100644
--- a/testsuite/tests/ghc-api/T12099.hs
+++ b/testsuite/tests/ghc-api/T12099.hs
@@ -1,6 +1,6 @@
 module Main where
 
-import DynFlags
+import GHC.Driver.Session
 
 import Control.Monad
 import Data.List (isPrefixOf)
diff --git a/testsuite/tests/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs
index feb792862b..58e40b5e85 100644
--- a/testsuite/tests/ghc-api/T4891/T4891.hs
+++ b/testsuite/tests/ghc-api/T4891/T4891.hs
@@ -7,7 +7,7 @@ import Data.Array
 import DataCon
 import GHC
 import GHC.Exts.Heap
-import HscTypes
+import GHC.Driver.Types
 import GHC.Runtime.Linker
 import GHC.Runtime.Heap.Inspect
 import TcEnv
@@ -21,7 +21,7 @@ import Control.Monad
 import Data.Maybe
 import Bag
 import Outputable
-import GhcMonad
+import GHC.Driver.Monad
 import X
 
 import System.Environment
diff --git a/testsuite/tests/ghc-api/T7478/T7478.hs b/testsuite/tests/ghc-api/T7478/T7478.hs
index bd6fb37d8b..4aa6f7d29e 100644
--- a/testsuite/tests/ghc-api/T7478/T7478.hs
+++ b/testsuite/tests/ghc-api/T7478/T7478.hs
@@ -8,7 +8,7 @@ import System.Environment
 import GHC
 import qualified Config as GHC
 import qualified Outputable as GHC
-import GhcMonad (liftIO)
+import GHC.Driver.Monad (liftIO)
 import Outputable (PprStyle, queryQual)
 
 compileInGhc :: [FilePath]          -- ^ Targets
diff --git a/testsuite/tests/ghc-api/T8628.hs b/testsuite/tests/ghc-api/T8628.hs
index d3b05a9f86..983adf8636 100644
--- a/testsuite/tests/ghc-api/T8628.hs
+++ b/testsuite/tests/ghc-api/T8628.hs
@@ -1,7 +1,7 @@
 module Main where
 
 import System.IO
-import DynFlags
+import GHC.Driver.Session
 import GHC
 import Exception
 import Module
diff --git a/testsuite/tests/ghc-api/T8639_api.hs b/testsuite/tests/ghc-api/T8639_api.hs
index 2b0bc7d4c6..eab7ff9146 100644
--- a/testsuite/tests/ghc-api/T8639_api.hs
+++ b/testsuite/tests/ghc-api/T8639_api.hs
@@ -1,7 +1,7 @@
 module Main where
 
 import GHC
-import GhcMonad
+import GHC.Driver.Monad
 import Outputable
 import System.IO
 import System.Environment( getArgs )
diff --git a/testsuite/tests/ghc-api/T9015.hs b/testsuite/tests/ghc-api/T9015.hs
index 977390b88e..228449041d 100644
--- a/testsuite/tests/ghc-api/T9015.hs
+++ b/testsuite/tests/ghc-api/T9015.hs
@@ -1,9 +1,9 @@
 module Main where
 
 import GHC
-import DynFlags
+import GHC.Driver.Session
 import System.Environment
-import GhcMonad
+import GHC.Driver.Monad
 
 testStrings = [
     "import Data.Maybe"
diff --git a/testsuite/tests/ghc-api/T9595.hs b/testsuite/tests/ghc-api/T9595.hs
index 0f71d7700b..a4c3dea7e4 100644
--- a/testsuite/tests/ghc-api/T9595.hs
+++ b/testsuite/tests/ghc-api/T9595.hs
@@ -1,11 +1,11 @@
 module Main where
 
 import GHC
-import Packages
-import GhcMonad
+import GHC.Driver.Packages
+import GHC.Driver.Monad
 import Outputable
 import System.Environment
-import DynFlags
+import GHC.Driver.Session
 import Module
 
 main =
diff --git a/testsuite/tests/ghc-api/annotations-literals/literals.hs b/testsuite/tests/ghc-api/annotations-literals/literals.hs
index 9243eba0b7..c125ea6e43 100644
--- a/testsuite/tests/ghc-api/annotations-literals/literals.hs
+++ b/testsuite/tests/ghc-api/annotations-literals/literals.hs
@@ -7,7 +7,7 @@ import Data.Data
 import Data.List (intercalate)
 import System.IO
 import GHC
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import Bag (filterBag,isEmptyBag)
diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
index cba17fe4c3..352aae6e17 100644
--- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs
+++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
@@ -8,7 +8,7 @@ import Data.Data
 import Data.List (intercalate)
 import System.IO
 import GHC
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import Bag (filterBag,isEmptyBag)
diff --git a/testsuite/tests/ghc-api/annotations/CheckUtils.hs b/testsuite/tests/ghc-api/annotations/CheckUtils.hs
index cdcec69029..a43348bcda 100644
--- a/testsuite/tests/ghc-api/annotations/CheckUtils.hs
+++ b/testsuite/tests/ghc-api/annotations/CheckUtils.hs
@@ -9,7 +9,7 @@ import Data.List
 import System.IO
 import GHC
 import BasicTypes
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import ApiAnnotation
diff --git a/testsuite/tests/ghc-api/annotations/annotations.hs b/testsuite/tests/ghc-api/annotations/annotations.hs
index a9d54a422b..d9157511aa 100644
--- a/testsuite/tests/ghc-api/annotations/annotations.hs
+++ b/testsuite/tests/ghc-api/annotations/annotations.hs
@@ -9,7 +9,7 @@ import Data.Data
 import Data.List (intercalate)
 import System.IO
 import GHC
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import Bag (filterBag,isEmptyBag)
diff --git a/testsuite/tests/ghc-api/annotations/comments.hs b/testsuite/tests/ghc-api/annotations/comments.hs
index 128a69f15e..8a36043e55 100644
--- a/testsuite/tests/ghc-api/annotations/comments.hs
+++ b/testsuite/tests/ghc-api/annotations/comments.hs
@@ -9,7 +9,7 @@ import Data.Data
 import Data.List (intercalate)
 import System.IO
 import GHC
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import Bag (filterBag,isEmptyBag)
diff --git a/testsuite/tests/ghc-api/annotations/listcomps.hs b/testsuite/tests/ghc-api/annotations/listcomps.hs
index 313da7c750..8af3bf6b69 100644
--- a/testsuite/tests/ghc-api/annotations/listcomps.hs
+++ b/testsuite/tests/ghc-api/annotations/listcomps.hs
@@ -10,7 +10,7 @@ import Data.List (intercalate)
 import System.IO
 import GHC
 import BasicTypes
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import ApiAnnotation
diff --git a/testsuite/tests/ghc-api/annotations/parseTree.hs b/testsuite/tests/ghc-api/annotations/parseTree.hs
index 453cade21d..be72c7f195 100644
--- a/testsuite/tests/ghc-api/annotations/parseTree.hs
+++ b/testsuite/tests/ghc-api/annotations/parseTree.hs
@@ -10,7 +10,7 @@ import Data.List (intercalate)
 import System.IO
 import GHC
 import BasicTypes
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils
 import Outputable
 import Bag (filterBag,isEmptyBag)
diff --git a/testsuite/tests/ghc-api/annotations/stringSource.hs b/testsuite/tests/ghc-api/annotations/stringSource.hs
index 9c5d114211..698d93a6e2 100644
--- a/testsuite/tests/ghc-api/annotations/stringSource.hs
+++ b/testsuite/tests/ghc-api/annotations/stringSource.hs
@@ -12,7 +12,7 @@ import Data.List (intercalate)
 import System.IO
 import GHC
 import BasicTypes
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import ForeignCall
 import MonadUtils
diff --git a/testsuite/tests/ghc-api/annotations/t11430.hs b/testsuite/tests/ghc-api/annotations/t11430.hs
index 81c070c01c..f1022805cf 100644
--- a/testsuite/tests/ghc-api/annotations/t11430.hs
+++ b/testsuite/tests/ghc-api/annotations/t11430.hs
@@ -12,7 +12,7 @@ import Data.List (intercalate)
 import System.IO
 import GHC
 import BasicTypes
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import ForeignCall
 import MonadUtils
diff --git a/testsuite/tests/ghc-api/apirecomp001/myghc.hs b/testsuite/tests/ghc-api/apirecomp001/myghc.hs
index 799382cac8..fba7dd3d48 100644
--- a/testsuite/tests/ghc-api/apirecomp001/myghc.hs
+++ b/testsuite/tests/ghc-api/apirecomp001/myghc.hs
@@ -10,7 +10,7 @@
 module Main where
 
 import GHC
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils ( MonadIO(..) )
 import BasicTypes ( failed )
 import Bag        ( bagToList )
diff --git a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
index 96bd4deb58..d3aeddd0bc 100644
--- a/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
+++ b/testsuite/tests/ghc-api/downsweep/OldModLocation.hs
@@ -1,9 +1,9 @@
 {-# LANGUAGE ViewPatterns #-}
 
 import GHC
-import GhcMake
-import DynFlags
-import Finder
+import GHC.Driver.Make
+import GHC.Driver.Session
+import GHC.Driver.Finder
 
 import Control.Monad.IO.Class (liftIO)
 import Data.List (sort, stripPrefix)
diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
index 86e6b9d650..df6a2b63f6 100644
--- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
+++ b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
@@ -4,8 +4,8 @@
 -- kinds of parse errors occur in modules.
 
 import GHC
-import GhcMake
-import DynFlags
+import GHC.Driver.Make
+import GHC.Driver.Session
 import Outputable
 import Exception (ExceptionMonad, ghandle)
 import Bag
diff --git a/testsuite/tests/ghc-api/target-contents/TargetContents.hs b/testsuite/tests/ghc-api/target-contents/TargetContents.hs
index 33e73e8991..04d97c108a 100644
--- a/testsuite/tests/ghc-api/target-contents/TargetContents.hs
+++ b/testsuite/tests/ghc-api/target-contents/TargetContents.hs
@@ -2,7 +2,7 @@
 
 module Main where
 
-import DynFlags
+import GHC.Driver.Session
 import GHC
 
 import Control.Monad
@@ -13,7 +13,7 @@ import Data.Time.Calendar
 import Data.Time.Clock
 import Exception
 import HeaderInfo
-import HscTypes
+import GHC.Driver.Types
 import Outputable
 import StringBuffer
 import System.Directory