HsUniToken for :: in GADT constructors (#19623)

One more step towards the new design of EPA.

Updates the haddock submodule.

6 files changed, 61 insertions, 11 deletions

diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
index 781d006b54..2e0335db9f 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
@@ -844,7 +844,7 @@
                 (Anchor
                  { T17544.hs:25:5-18 }
                  (UnchangedAnchor))
-                [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:25:10-11 }))]
+                []
                 (EpaComments
                  []))
                [(L
@@ -852,6 +852,10 @@
                  (Unqual
                   {OccName: MkD5}))]
                (L
+                (TokenLoc
+                 (EpaSpan { T17544.hs:25:10-11 }))
+                (HsNormalTok))
+               (L
                 (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-18 })
                 (HsOuterImplicit
                  (NoExtField)))
@@ -1106,7 +1110,7 @@
                 (Anchor
                  { T17544.hs:31:5-18 }
                  (UnchangedAnchor))
-                [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:31:10-11 }))]
+                []
                 (EpaComments
                  []))
                [(L
@@ -1114,6 +1118,10 @@
                  (Unqual
                   {OccName: MkD6}))]
                (L
+                (TokenLoc
+                 (EpaSpan { T17544.hs:31:10-11 }))
+                (HsNormalTok))
+               (L
                 (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-18 })
                 (HsOuterImplicit
                  (NoExtField)))
@@ -1368,7 +1376,7 @@
                 (Anchor
                  { T17544.hs:37:5-18 }
                  (UnchangedAnchor))
-                [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:37:10-11 }))]
+                []
                 (EpaComments
                  []))
                [(L
@@ -1376,6 +1384,10 @@
                  (Unqual
                   {OccName: MkD7}))]
                (L
+                (TokenLoc
+                 (EpaSpan { T17544.hs:37:10-11 }))
+                (HsNormalTok))
+               (L
                 (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-18 })
                 (HsOuterImplicit
                  (NoExtField)))
@@ -1630,7 +1642,7 @@
                 (Anchor
                  { T17544.hs:43:5-18 }
                  (UnchangedAnchor))
-                [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:43:10-11 }))]
+                []
                 (EpaComments
                  []))
                [(L
@@ -1638,6 +1650,10 @@
                  (Unqual
                   {OccName: MkD8}))]
                (L
+                (TokenLoc
+                 (EpaSpan { T17544.hs:43:10-11 }))
+                (HsNormalTok))
+               (L
                 (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-18 })
                 (HsOuterImplicit
                  (NoExtField)))
@@ -1892,7 +1908,7 @@
                 (Anchor
                  { T17544.hs:49:5-18 }
                  (UnchangedAnchor))
-                [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:49:10-11 }))]
+                []
                 (EpaComments
                  []))
                [(L
@@ -1900,6 +1916,10 @@
                  (Unqual
                   {OccName: MkD9}))]
                (L
+                (TokenLoc
+                 (EpaSpan { T17544.hs:49:10-11 }))
+                (HsNormalTok))
+               (L
                 (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-18 })
                 (HsOuterImplicit
                  (NoExtField)))
@@ -2154,7 +2174,7 @@
                 (Anchor
                  { T17544.hs:55:5-20 }
                  (UnchangedAnchor))
-                [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:55:11-12 }))]
+                []
                 (EpaComments
                  []))
                [(L
@@ -2162,6 +2182,10 @@
                  (Unqual
                   {OccName: MkD10}))]
                (L
+                (TokenLoc
+                 (EpaSpan { T17544.hs:55:11-12 }))
+                (HsNormalTok))
+               (L
                 (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-20 })
                 (HsOuterImplicit
                  (NoExtField)))
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
index 63fe2c10d5..889833f2a6 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
@@ -75,7 +75,7 @@
            (Anchor
             { T17544_kw.hs:16:9-20 }
             (UnchangedAnchor))
-           [(AddEpAnn AnnDcolon (EpaSpan { T17544_kw.hs:16:15-16 }))]
+           []
            (EpaComments
             []))
           [(L
@@ -83,6 +83,10 @@
             (Unqual
              {OccName: MkFoo}))]
           (L
+           (TokenLoc
+            (EpaSpan { T17544_kw.hs:16:15-16 }))
+           (HsNormalTok))
+          (L
            (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
            (HsOuterImplicit
             (NoExtField)))
@@ -159,7 +163,7 @@
            (Anchor
             { T17544_kw.hs:19:9-26 }
             (UnchangedAnchor))
-           [(AddEpAnn AnnDcolon (EpaSpan { T17544_kw.hs:19:15-16 }))]
+           []
            (EpaComments
             []))
           [(L
@@ -167,6 +171,10 @@
             (Unqual
              {OccName: MkBar}))]
           (L
+           (TokenLoc
+            (EpaSpan { T17544_kw.hs:19:15-16 }))
+           (HsNormalTok))
+          (L
            (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:19:18-26 })
            (HsOuterImplicit
             (NoExtField)))
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 0f41f9a4d0..3b0dd87fd3 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -1238,7 +1238,7 @@
              (Anchor
               { DumpParsedAst.hs:22:3-45 }
               (UnchangedAnchor))
-             [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:22:7-8 }))]
+             []
              (EpaComments
               []))
             [(L
@@ -1246,6 +1246,10 @@
               (Unqual
                {OccName: Nat}))]
             (L
+             (TokenLoc
+              (EpaSpan { DumpParsedAst.hs:22:7-8 }))
+             (HsNormalTok))
+            (L
              (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:22:10-45 })
              (HsOuterImplicit
               (NoExtField)))
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index cfaa1b102e..c89f054ce4 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -585,6 +585,10 @@
                 (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:20:3-5 })
                 {Name: DumpRenamedAst.Nat})]
               (L
+               (TokenLoc
+                (EpaSpan { DumpRenamedAst.hs:20:7-8 }))
+               (HsNormalTok))
+              (L
                (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:20:10-45 })
                (HsOuterImplicit
                 [{Name: f}
diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr
index 0a2f60dd59..693814f96e 100644
--- a/testsuite/tests/parser/should_compile/T15323.stderr
+++ b/testsuite/tests/parser/should_compile/T15323.stderr
@@ -89,7 +89,7 @@
            (Anchor
             { T15323.hs:6:5-54 }
             (UnchangedAnchor))
-           [(AddEpAnn AnnDcolon (EpaSpan { T15323.hs:6:17-18 }))]
+           []
            (EpaComments
             []))
           [(L
@@ -97,6 +97,10 @@
             (Unqual
              {OccName: TestParens}))]
           (L
+           (TokenLoc
+            (EpaSpan { T15323.hs:6:17-18 }))
+           (HsNormalTok))
+          (L
            (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:20-54 })
            (HsOuterExplicit
             (EpAnn
@@ -225,3 +229,5 @@
        []))))]
   (Nothing)
   (Nothing)))
+
+
diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr
index 65fe422f4a..8d3588e7ec 100644
--- a/testsuite/tests/printer/T18791.stderr
+++ b/testsuite/tests/printer/T18791.stderr
@@ -75,7 +75,7 @@
            (Anchor
             { T18791.hs:5:3-17 }
             (UnchangedAnchor))
-           [(AddEpAnn AnnDcolon (EpaSpan { T18791.hs:5:7-8 }))]
+           []
            (EpaComments
             []))
           [(L
@@ -83,6 +83,10 @@
             (Unqual
              {OccName: MkT}))]
           (L
+           (TokenLoc
+            (EpaSpan { T18791.hs:5:7-8 }))
+           (HsNormalTok))
+          (L
            (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:10-17 })
            (HsOuterImplicit
             (NoExtField)))