Remove many GHC dependencies from L.H.S

Continue to prune the `Language.Haskell.Syntax.*` modules out of GHC
imports according to the plan in the linked issue.

Moves more GHC-specific declarations to `GHC.*` and brings more required
GHC-independent declarations to `Language.Haskell.Syntax.*` (extending
e.g. `Language.Haskell.Syntax.Basic`).

Progress towards #21592

Bump haddock submodule for !8308

-------------------------
Metric Decrease:
    hard_hole_fits
-------------------------

13 files changed, 42 insertions, 75 deletions

diff --git a/testsuite/tests/count-deps/CountDepsAst.stdout b/testsuite/tests/count-deps/CountDepsAst.stdout
index e801360c11..d471670b49 100644
--- a/testsuite/tests/count-deps/CountDepsAst.stdout
+++ b/testsuite/tests/count-deps/CountDepsAst.stdout
@@ -280,6 +280,7 @@ GHC.Utils.Ppr.Colour
 GHC.Utils.TmpFs
 GHC.Utils.Trace
 Language.Haskell.Syntax
+Language.Haskell.Syntax.Basic
 Language.Haskell.Syntax.Binds
 Language.Haskell.Syntax.Decls
 Language.Haskell.Syntax.Expr
diff --git a/testsuite/tests/count-deps/CountDepsParser.stdout b/testsuite/tests/count-deps/CountDepsParser.stdout
index 86ab7d3e18..f1882b5f0f 100644
--- a/testsuite/tests/count-deps/CountDepsParser.stdout
+++ b/testsuite/tests/count-deps/CountDepsParser.stdout
@@ -287,6 +287,7 @@ GHC.Utils.Ppr.Colour
 GHC.Utils.TmpFs
 GHC.Utils.Trace
 Language.Haskell.Syntax
+Language.Haskell.Syntax.Basic
 Language.Haskell.Syntax.Binds
 Language.Haskell.Syntax.Decls
 Language.Haskell.Syntax.Expr
diff --git a/testsuite/tests/module/mod185.stderr b/testsuite/tests/module/mod185.stderr
index b5af7f60ba..f5dbe2fa70 100644
--- a/testsuite/tests/module/mod185.stderr
+++ b/testsuite/tests/module/mod185.stderr
@@ -128,7 +128,4 @@
                    {ModuleName: Prelude}
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index f11708fa06..7ab8440879 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -1532,7 +1532,4 @@
                     (SourceText "hello")
                     {FastString: "hello"})))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr b/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
index fd620baf4b..d453ae5de1 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
@@ -188,8 +188,7 @@
                      (NoExtField)
                      (NoExtField)))])))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -279,7 +278,4 @@
                     (SourceText "hello")
                     {FastString: "hello"})))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index 290d505195..456117aa2c 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -81,8 +81,7 @@
                          (SourceText "hello")
                          {FastString: "hello"})))))))]
                  (EmptyLocalBinds
-                  (NoExtField)))))]))
-           []))]})]
+                  (NoExtField)))))]))))]})]
      []))
    []
    [(TyClGroup
diff --git a/testsuite/tests/parser/should_compile/DumpSemis.stderr b/testsuite/tests/parser/should_compile/DumpSemis.stderr
index 3d0a47521e..9147e29ec4 100644
--- a/testsuite/tests/parser/should_compile/DumpSemis.stderr
+++ b/testsuite/tests/parser/should_compile/DumpSemis.stderr
@@ -386,8 +386,7 @@
                      (NoExtField)
                      (NoExtField)))])))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -597,8 +596,7 @@
                      (NoExtField)
                      (NoExtField)))])))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -834,8 +832,7 @@
                      (NoExtField)
                      (NoExtField)))])))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -902,8 +899,7 @@
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -970,8 +966,7 @@
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -1039,8 +1034,7 @@
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -1441,8 +1435,7 @@
                   (Unqual
                    {OccName: x}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -1623,8 +1616,7 @@
                                      (False)
                                      (2))))))))]
                              (EmptyLocalBinds
-                              (NoExtField)))))]))
-                       []))
+                              (NoExtField)))))]))))
                     ,(L
                       (SrcSpanAnn (EpAnn
                                    (Anchor
@@ -1705,8 +1697,7 @@
                                      (False)
                                      (3))))))))]
                              (EmptyLocalBinds
-                              (NoExtField)))))]))
-                       []))]}
+                              (NoExtField)))))]))))]}
                    []))
                  (L
                   (TokenLoc
@@ -1721,8 +1712,7 @@
                     (Unqual
                      {OccName: y}))))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -2121,7 +2111,4 @@
                        (EmptyLocalBinds
                         (NoExtField)))))]))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
index 8cc15cc04c..d0c6b5cf13 100644
--- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr
@@ -1536,7 +1536,9 @@
                      (EpaComments
                       [])) { DumpTypecheckedAst.hs:19:1-23 })
         (FunBind
-         (WpHole)
+         ((,)
+          (WpHole)
+          [])
          (L
           (SrcSpanAnn (EpAnnNotUsed) { DumpTypecheckedAst.hs:19:1-4 })
           {Var: main})
@@ -1597,8 +1599,7 @@
                        (SourceText "hello")
                        {FastString: "hello"})))))))]
                (EmptyLocalBinds
-                (NoExtField)))))]))
-         []))]}
+                (NoExtField)))))]))))]}
      (False))))]}
 
 
diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr
index 7794fda45e..f9b9a986e4 100644
--- a/testsuite/tests/parser/should_compile/KindSigs.stderr
+++ b/testsuite/tests/parser/should_compile/KindSigs.stderr
@@ -919,8 +919,7 @@
                   (Exact
                    {Name: ()}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))
+             (NoExtField)))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -1515,7 +1514,4 @@
                   (Unqual
                    {OccName: True}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/parser/should_compile/T20718.stderr b/testsuite/tests/parser/should_compile/T20718.stderr
index fd8fbfb261..ab90eb29bc 100644
--- a/testsuite/tests/parser/should_compile/T20718.stderr
+++ b/testsuite/tests/parser/should_compile/T20718.stderr
@@ -158,7 +158,4 @@
                     (False)
                     (1))))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/parser/should_compile/T20846.stderr b/testsuite/tests/parser/should_compile/T20846.stderr
index 5d2cf5c0ea..edacbd9ff6 100644
--- a/testsuite/tests/parser/should_compile/T20846.stderr
+++ b/testsuite/tests/parser/should_compile/T20846.stderr
@@ -151,7 +151,4 @@
                   (Unqual
                    {OccName: undefined}))))))]
             (EmptyLocalBinds
-             (NoExtField)))))]))
-      [])))]))
-
-
+             (NoExtField)))))])))))]))
diff --git a/testsuite/tests/perf/compiler/hard_hole_fits.stderr b/testsuite/tests/perf/compiler/hard_hole_fits.stderr
index 01df15c56c..a81e8362c3 100644
--- a/testsuite/tests/perf/compiler/hard_hole_fits.stderr
+++ b/testsuite/tests/perf/compiler/hard_hole_fits.stderr
@@ -300,7 +300,8 @@ hard_hole_fits.hs:29:38: warning: [-Wtyped-holes (in -Wdefault)]
     • In an equation for ‘testMe’:
           testMe (ExplicitTuple xet gls box) = _
     • Relevant bindings include
-        box :: GHC.Types.Basic.Boxity (bound at hard_hole_fits.hs:29:31)
+        box :: Language.Haskell.Syntax.Basic.Boxity
+          (bound at hard_hole_fits.hs:29:31)
         gls :: [HsTupArg GhcPs] (bound at hard_hole_fits.hs:29:27)
         xet :: Language.Haskell.Syntax.Extension.XExplicitTuple GhcPs
           (bound at hard_hole_fits.hs:29:23)
@@ -320,14 +321,18 @@ hard_hole_fits.hs:30:35: warning: [-Wtyped-holes (in -Wdefault)]
     • In an equation for ‘testMe’: testMe (ExplicitSum xes n i gl) = _
     • Relevant bindings include
         gl :: LHsExpr GhcPs (bound at hard_hole_fits.hs:30:29)
-        i :: GHC.Types.Basic.Arity (bound at hard_hole_fits.hs:30:27)
-        n :: GHC.Types.Basic.ConTag (bound at hard_hole_fits.hs:30:25)
+        i :: Language.Haskell.Syntax.Basic.SumWidth
+          (bound at hard_hole_fits.hs:30:27)
+        n :: Language.Haskell.Syntax.Basic.ConTag
+          (bound at hard_hole_fits.hs:30:25)
         xes :: Language.Haskell.Syntax.Extension.XExplicitSum GhcPs
           (bound at hard_hole_fits.hs:30:21)
         testMe :: HsExpr GhcPs -> Int (bound at hard_hole_fits.hs:14:1)
       Valid hole fits include
-        n :: GHC.Types.Basic.ConTag (bound at hard_hole_fits.hs:30:25)
-        i :: GHC.Types.Basic.Arity (bound at hard_hole_fits.hs:30:27)
+        n :: Language.Haskell.Syntax.Basic.ConTag
+          (bound at hard_hole_fits.hs:30:25)
+        i :: Language.Haskell.Syntax.Basic.SumWidth
+          (bound at hard_hole_fits.hs:30:27)
         maxBound :: forall a. Bounded a => a
           with maxBound @Int
           (imported from ‘Prelude’ at hard_hole_fits.hs:8:8-20
diff --git a/testsuite/tests/printer/Test20297.stdout b/testsuite/tests/printer/Test20297.stdout
index 9bda031e23..9a220e21db 100644
--- a/testsuite/tests/printer/Test20297.stdout
+++ b/testsuite/tests/printer/Test20297.stdout
@@ -143,8 +143,7 @@
               (NoAnnSortKey)
               {Bag(LocatedA (HsBind GhcPs)):
                []}
-              [])))))]))
-      [])))
+              [])))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -342,10 +341,8 @@
                                  (NoExtField)
                                  (NoExtField)))])))))]
                         (EmptyLocalBinds
-                         (NoExtField)))))]))
-                  []))]}
-              [])))))]))
-      [])))]))
+                         (NoExtField)))))]))))]}
+              [])))))])))))]))
 
 
 
@@ -479,8 +476,7 @@
               (NoAnnSortKey)
               {Bag(LocatedA (HsBind GhcPs)):
                []}
-              [])))))]))
-      [])))
+              [])))))])))))
   ,(L
     (SrcSpanAnn (EpAnn
                  (Anchor
@@ -671,9 +667,6 @@
                                  (NoExtField)
                                  (NoExtField)))])))))]
                         (EmptyLocalBinds
-                         (NoExtField)))))]))
-                  []))]}
-              [])))))]))
-      [])))]))
-
+                         (NoExtField)))))]))))]}
+              [])))))])))))]))