TTG: Move ImpExp client-independent bits to L.H.S.ImpExp

Move the GHC-independent definitions from GHC.Hs.ImpExp to
Language.Haskell.Syntax.ImpExp with the required TTG extension fields
such as to keep the AST independent from GHC.

This is progress towards having the haskell-syntax package, as described
in #21592

Bumps haddock submodule

2 files changed, 97 insertions, 94 deletions

diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr
index 8d3588e7ec..f4264de86d 100644
--- a/testsuite/tests/printer/T18791.stderr
+++ b/testsuite/tests/printer/T18791.stderr
@@ -4,30 +4,33 @@
 (L
  { T18791.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { T18791.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { T18791.hs:2:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:2:15-19 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { T18791.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { T18791.hs:2:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:2:15-19 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
      []
-     []))
-   (EpaCommentsBalanced
-    []
-    [(L
-      (Anchor
-       { T18791.hs:6:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { T18791.hs:6:1 }))]))
-  (VirtualBraces
-   (1))
+     [(L
+       (Anchor
+        { T18791.hs:6:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { T18791.hs:6:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:2:8-13 })
@@ -136,8 +139,6 @@
              (Unqual
               {OccName: T}))))
           (Nothing)))]
-       []))))]
-  (Nothing)
-  (Nothing)))
+       []))))]))
 
 
diff --git a/testsuite/tests/printer/Test20297.stdout b/testsuite/tests/printer/Test20297.stdout
index 2328e8201c..9bda031e23 100644
--- a/testsuite/tests/printer/Test20297.stdout
+++ b/testsuite/tests/printer/Test20297.stdout
@@ -4,37 +4,40 @@
 (L
  { Test20297.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { Test20297.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { Test20297.hs:2:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { Test20297.hs:2:18-22 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { Test20297.hs:1:1-33 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaBlockComment
-        "{-# OPTIONS -ddump-parsed-ast #-}")
-       { Test20297.hs:1:1 }))]
-    [(L
-      (Anchor
-       { Test20297.hs:12:1 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { Test20297.hs:12:1 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { Test20297.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { Test20297.hs:2:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { Test20297.hs:2:18-22 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { Test20297.hs:1:1-33 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaBlockComment
+         "{-# OPTIONS -ddump-parsed-ast #-}")
+        { Test20297.hs:1:1 }))]
+     [(L
+       (Anchor
+        { Test20297.hs:12:1 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { Test20297.hs:12:1 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { Test20297.hs:2:8-16 })
@@ -342,9 +345,7 @@
                          (NoExtField)))))]))
                   []))]}
               [])))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))
 
 
 
@@ -353,37 +354,40 @@
 (L
  { Test20297.ppr.hs:1:1 }
  (HsModule
-  (EpAnn
-   (Anchor
-    { Test20297.ppr.hs:1:1 }
-    (UnchangedAnchor))
-   (AnnsModule
-    [(AddEpAnn AnnModule (EpaSpan { Test20297.ppr.hs:2:1-6 }))
-    ,(AddEpAnn AnnWhere (EpaSpan { Test20297.ppr.hs:2:18-22 }))]
-    (AnnList
-     (Nothing)
-     (Nothing)
-     (Nothing)
-     []
-     []))
-   (EpaCommentsBalanced
-    [(L
-      (Anchor
-       { Test20297.ppr.hs:1:1-33 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaBlockComment
-        "{-# OPTIONS -ddump-parsed-ast #-}")
-       { Test20297.ppr.hs:1:1 }))]
-    [(L
-      (Anchor
-       { Test20297.ppr.hs:9:25 }
-       (UnchangedAnchor))
-      (EpaComment
-       (EpaEofComment)
-       { Test20297.ppr.hs:9:20 }))]))
-  (VirtualBraces
-   (1))
+  (XModulePs
+   (EpAnn
+    (Anchor
+     { Test20297.ppr.hs:1:1 }
+     (UnchangedAnchor))
+    (AnnsModule
+     [(AddEpAnn AnnModule (EpaSpan { Test20297.ppr.hs:2:1-6 }))
+     ,(AddEpAnn AnnWhere (EpaSpan { Test20297.ppr.hs:2:18-22 }))]
+     (AnnList
+      (Nothing)
+      (Nothing)
+      (Nothing)
+      []
+      []))
+    (EpaCommentsBalanced
+     [(L
+       (Anchor
+        { Test20297.ppr.hs:1:1-33 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaBlockComment
+         "{-# OPTIONS -ddump-parsed-ast #-}")
+        { Test20297.ppr.hs:1:1 }))]
+     [(L
+       (Anchor
+        { Test20297.ppr.hs:9:25 }
+        (UnchangedAnchor))
+       (EpaComment
+        (EpaEofComment)
+        { Test20297.ppr.hs:9:20 }))]))
+   (VirtualBraces
+    (1))
+   (Nothing)
+   (Nothing))
   (Just
    (L
     (SrcSpanAnn (EpAnnNotUsed) { Test20297.ppr.hs:2:8-16 })
@@ -670,8 +674,6 @@
                          (NoExtField)))))]))
                   []))]}
               [])))))]))
-      [])))]
-  (Nothing)
-  (Nothing)))
+      [])))]))