Modules (#13009)

* SysTools
* Parser
* GHC.Builtin
* GHC.Iface.Recomp
* Settings

Update Haddock submodule

Metric Decrease:
    Naperian
    parsing001

15 files changed, 17 insertions, 17 deletions

diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs
index fec7a1fe64..5a3820fd34 100644
--- a/testsuite/tests/callarity/unittest/CallArity1.hs
+++ b/testsuite/tests/callarity/unittest/CallArity1.hs
@@ -6,11 +6,11 @@ import GHC.Core.Type
 import GHC.Core.Make
 import GHC.Core.Opt.CallArity (callArityRHS)
 import GHC.Types.Id.Make
-import SysTools
+import GHC.SysTools
 import GHC.Driver.Session
 import ErrUtils
 import Outputable
-import TysWiredIn
+import GHC.Builtin.Types
 import GHC.Types.Literal
 import GHC
 import Control.Monad
diff --git a/testsuite/tests/codeGen/should_fail/T13233.hs b/testsuite/tests/codeGen/should_fail/T13233.hs
index a8d2343e65..82e08e207b 100644
--- a/testsuite/tests/codeGen/should_fail/T13233.hs
+++ b/testsuite/tests/codeGen/should_fail/T13233.hs
@@ -22,7 +22,7 @@ quux :: ()
 quux = obscure (#,#)
 
 -- It used to be that primops has no binding. However, as described in
--- Note [Primop wrappers] in PrimOp we now rewrite unsaturated primop
+-- Note [Primop wrappers] in GHC.Builtin.PrimOps we now rewrite unsaturated primop
 -- applications to their wrapper, which allows safe use of levity polymorphism.
 primop :: forall (rep :: RuntimeRep) (a :: TYPE rep) b c.
           a -> b -> (State# RealWorld -> (# State# RealWorld, c #))
diff --git a/testsuite/tests/codeGen/should_fail/T13233_elab.hs b/testsuite/tests/codeGen/should_fail/T13233_elab.hs
index 87269769d9..8f62332af6 100644
--- a/testsuite/tests/codeGen/should_fail/T13233_elab.hs
+++ b/testsuite/tests/codeGen/should_fail/T13233_elab.hs
@@ -25,7 +25,7 @@ quux :: ()
 quux = obscure (#,#)
 
 -- It used to be that primops has no binding. However, as described in
--- Note [Primop wrappers] in PrimOp we now rewrite unsaturated primop
+-- Note [Primop wrappers] in GHC.Builtin.PrimOps we now rewrite unsaturated primop
 -- applications to their wrapper, which allows safe use of levity polymorphism.
 primop :: forall (rep :: RuntimeRep) (a :: TYPE rep) b c.
           a -> b -> (State# RealWorld -> (# State# RealWorld, c #))
diff --git a/testsuite/tests/driver/T15396.hs b/testsuite/tests/driver/T15396.hs
index 9ab9f6e6e6..6fe44bcb1a 100644
--- a/testsuite/tests/driver/T15396.hs
+++ b/testsuite/tests/driver/T15396.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-import Ar
+import GHC.SysTools.Ar
 
 -- obtained from echo -n \0 > x.o && ar -q b.a x.o && cat b.a
 archive = "!<arch>\nx.o/            0           0     0     644     1         \
diff --git a/testsuite/tests/ghc-api/T10942.hs b/testsuite/tests/ghc-api/T10942.hs
index 53528ad718..3598751676 100644
--- a/testsuite/tests/ghc-api/T10942.hs
+++ b/testsuite/tests/ghc-api/T10942.hs
@@ -5,7 +5,7 @@ import GHC
 
 import Control.Monad.IO.Class (liftIO)
 import System.Environment
-import HeaderInfo
+import GHC.Parser.Header
 import Outputable
 import StringBuffer
 
diff --git a/testsuite/tests/ghc-api/T11579.hs b/testsuite/tests/ghc-api/T11579.hs
index 418057120c..9e45410d2e 100644
--- a/testsuite/tests/ghc-api/T11579.hs
+++ b/testsuite/tests/ghc-api/T11579.hs
@@ -3,7 +3,7 @@ import GHC.Driver.Session
 import FastString
 import GHC
 import StringBuffer
-import Lexer
+import GHC.Parser.Lexer
 import GHC.Types.SrcLoc
 
 main :: IO ()
diff --git a/testsuite/tests/ghc-api/T8628.hs b/testsuite/tests/ghc-api/T8628.hs
index c3461b2eb7..a7cbdaa07c 100644
--- a/testsuite/tests/ghc-api/T8628.hs
+++ b/testsuite/tests/ghc-api/T8628.hs
@@ -11,7 +11,7 @@ import Outputable
 import Bag (filterBag,isEmptyBag)
 import System.Directory (removeFile)
 import System.Environment( getArgs )
-import PrelNames
+import GHC.Builtin.Names
 
 main :: IO()
 main
diff --git a/testsuite/tests/ghc-api/annotations/CheckUtils.hs b/testsuite/tests/ghc-api/annotations/CheckUtils.hs
index 473ded85ef..275067ac8a 100644
--- a/testsuite/tests/ghc-api/annotations/CheckUtils.hs
+++ b/testsuite/tests/ghc-api/annotations/CheckUtils.hs
@@ -12,7 +12,7 @@ import GHC.Types.Basic
 import GHC.Driver.Session
 import MonadUtils
 import Outputable
-import ApiAnnotation
+import GHC.Parser.Annotation
 import Bag (filterBag,isEmptyBag)
 import System.Directory (removeFile)
 import System.Environment( getArgs )
diff --git a/testsuite/tests/ghc-api/annotations/listcomps.hs b/testsuite/tests/ghc-api/annotations/listcomps.hs
index 9f8fb4e6b4..cd5eb86927 100644
--- a/testsuite/tests/ghc-api/annotations/listcomps.hs
+++ b/testsuite/tests/ghc-api/annotations/listcomps.hs
@@ -13,7 +13,7 @@ import GHC.Types.Basic
 import GHC.Driver.Session
 import MonadUtils
 import Outputable
-import ApiAnnotation
+import GHC.Parser.Annotation
 import Bag (filterBag,isEmptyBag)
 import System.Directory (removeFile)
 import System.Environment( getArgs )
diff --git a/testsuite/tests/ghc-api/target-contents/TargetContents.hs b/testsuite/tests/ghc-api/target-contents/TargetContents.hs
index 04d97c108a..f71d1131e3 100644
--- a/testsuite/tests/ghc-api/target-contents/TargetContents.hs
+++ b/testsuite/tests/ghc-api/target-contents/TargetContents.hs
@@ -12,7 +12,7 @@ import Data.Maybe
 import Data.Time.Calendar
 import Data.Time.Clock
 import Exception
-import HeaderInfo
+import GHC.Parser.Header
 import GHC.Driver.Types
 import Outputable
 import StringBuffer
diff --git a/testsuite/tests/hiefile/should_run/PatTypes.hs b/testsuite/tests/hiefile/should_run/PatTypes.hs
index c38cacab80..25803d0e47 100644
--- a/testsuite/tests/hiefile/should_run/PatTypes.hs
+++ b/testsuite/tests/hiefile/should_run/PatTypes.hs
@@ -13,7 +13,7 @@ import GHC.Iface.Ext.Types
 import GHC.Iface.Ext.Utils
 
 import GHC.Driver.Session
-import SysTools
+import GHC.SysTools
 
 import qualified Data.Map as M
 import Data.Foldable
diff --git a/testsuite/tests/layout/layout006.hs b/testsuite/tests/layout/layout006.hs
index 70eacb42cf..84ad72760a 100644
--- a/testsuite/tests/layout/layout006.hs
+++ b/testsuite/tests/layout/layout006.hs
@@ -1,7 +1,7 @@
 
 module M where
 
--- GHC's RdrHsSyn.lhs had a piece of code like this
+-- GHC's GHC.Parser.PostProcess had a piece of code like this
 
 f :: IO ()
 f
diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs
index 1872c93ba8..03313fb66f 100644
--- a/testsuite/tests/parser/should_run/CountParserDeps.hs
+++ b/testsuite/tests/parser/should_run/CountParserDeps.hs
@@ -40,7 +40,7 @@ parserDeps libdir =
         (df, _, _) <- parseDynamicFlags df [noLoc "-package=ghc"]
         setSessionDynFlags df
         env <- getSession
-        loop env emptyUniqSet [mkModuleName "Parser"]
+        loop env emptyUniqSet [mkModuleName "GHC.Parser"]
   where
     -- Source imports are only guaranteed to show up in the 'mi_deps'
     -- of modules that import them directly and don’t propagate
diff --git a/testsuite/tests/unboxedsums/UbxSumLevPoly.hs b/testsuite/tests/unboxedsums/UbxSumLevPoly.hs
index 3275eb7dfe..ba4e4e50e6 100644
--- a/testsuite/tests/unboxedsums/UbxSumLevPoly.hs
+++ b/testsuite/tests/unboxedsums/UbxSumLevPoly.hs
@@ -5,7 +5,7 @@ module UbxSumLevPoly where
 -- this failed thinking that (# Any | True #) :: TYPE (SumRep [LiftedRep, b])
 -- But of course that b should be Lifted!
 
--- It was due to silliness in TysWiredIn using the same uniques for different
+-- It was due to silliness in GHC.Builtin.Types using the same uniques for different
 -- things in mk_sum.
 
 p = True
diff --git a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs
index 5794875556..8d5c7756d9 100644
--- a/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs
+++ b/testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs
@@ -5,8 +5,8 @@ import GHC
 import GHC.Driver.Monad
 import Outputable
 import GHC.Types.RepType
-import TysPrim
-import TysWiredIn
+import GHC.Builtin.Types.Prim
+import GHC.Builtin.Types
 import GHC.Types.Unique.Set
 import GHC.Types.Unique