diff options
author | Alan Zimmerman <alan.zimm@gmail.com> | 2021-04-15 20:57:54 +0100 |
---|---|---|
committer | Alan Zimmerman <alan.zimm@gmail.com> | 2021-04-18 18:17:19 +0100 |
commit | 9bd8f0f232067ef805d079315ba54e12b12bef46 (patch) | |
tree | fcb4a703c3879835ed62f712f08e9ff391ab88ee /testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr | |
parent | 0a8c14bd5a5438b1d042ad279b8ffff1bc867e7e (diff) | |
download | haskell-wip/az/T19579.tar.gz |
EPA: cleanups after the mergewip/az/T19579
Remove EpaAnn type synonym, rename EpaAnn' to EpaAnn.
Closes #19705
Updates haddock submodule
--
Change
data EpaAnchor = AR RealSrcSpan
| AD DeltaPos
To instead be
data EpaAnchor = AnchorReal RealSrcSpan
| AnchorDelta DeltaPos
Closes #19699
--
Change
data DeltaPos =
DP
{ deltaLine :: !Int,
deltaColumn :: !Int
}
To instead be
data DeltaPos
= SameLine { deltaColumn :: !Int }
| DifferentLine { deltaLine :: !Int, startColumn :: !Int }
Closes #19698
--
Also some clean-ups of unused parts of check-exact.
Diffstat (limited to 'testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr')
-rw-r--r-- | testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr index 7e34424807..db88734005 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr @@ -9,8 +9,8 @@ { T17544.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { T17544.hs:3:1-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:3:15-19 }))] + [(AddEpAnn AnnModule (EpaSpan { T17544.hs:3:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:3:15-19 }))] (AnnList (Nothing) (Nothing) @@ -51,8 +51,8 @@ (Anchor { T17544.hs:(5,1)-(6,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:5:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:5:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:5:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:5:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -90,7 +90,7 @@ { T17544.hs:6:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:6:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:6:6-7 })) []) (EpaComments [])) @@ -113,7 +113,7 @@ { T17544.hs:6:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:6:11-12 })) + (EpaSpan { T17544.hs:6:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -178,8 +178,8 @@ (Anchor { T17544.hs:(9,1)-(10,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:9:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:9:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:9:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:9:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -217,7 +217,7 @@ { T17544.hs:10:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:10:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:10:6-7 })) []) (EpaComments [])) @@ -240,7 +240,7 @@ { T17544.hs:10:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:10:11-12 })) + (EpaSpan { T17544.hs:10:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -301,8 +301,8 @@ (Anchor { T17544.hs:(13,1)-(14,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:13:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:13:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:13:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:13:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -340,7 +340,7 @@ { T17544.hs:14:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:14:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:14:6-7 })) []) (EpaComments [])) @@ -363,7 +363,7 @@ { T17544.hs:14:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:14:11-12 })) + (EpaSpan { T17544.hs:14:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -427,8 +427,8 @@ (Anchor { T17544.hs:(17,1)-(20,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:17:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:17:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:17:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:17:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -466,7 +466,7 @@ { T17544.hs:18:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:18:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:18:6-7 })) []) (EpaComments [])) @@ -489,7 +489,7 @@ { T17544.hs:18:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:18:11-12 })) + (EpaSpan { T17544.hs:18:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -532,7 +532,7 @@ { T17544.hs:20:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:20:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:20:6-7 })) []) (EpaComments [])) @@ -555,7 +555,7 @@ { T17544.hs:20:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:20:11-12 })) + (EpaSpan { T17544.hs:20:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -612,10 +612,10 @@ (Anchor { T17544.hs:22:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:22:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:22:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:22:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:22:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:22:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:22:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:22:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:22:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -654,7 +654,7 @@ (Anchor { T17544.hs:22:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:22:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:22:20-23 }))] (EpaComments [])) (DataFamily) @@ -707,8 +707,8 @@ (Anchor { T17544.hs:23:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:23:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:23:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:23:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:23:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -789,8 +789,8 @@ (Anchor { T17544.hs:(24,3)-(25,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:24:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:24:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:24:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:24:15-19 }))] (EpaComments [])) (DataType) @@ -804,7 +804,7 @@ (Anchor { T17544.hs:25:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:25:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:25:10-11 }))] (EpaComments [])) [(L @@ -872,10 +872,10 @@ (Anchor { T17544.hs:28:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:28:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:28:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:28:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:28:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:28:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:28:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:28:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:28:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -914,7 +914,7 @@ (Anchor { T17544.hs:28:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:28:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:28:20-23 }))] (EpaComments [])) (DataFamily) @@ -967,8 +967,8 @@ (Anchor { T17544.hs:29:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:29:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:29:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:29:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:29:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1049,8 +1049,8 @@ (Anchor { T17544.hs:(30,3)-(31,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:30:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:30:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:30:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:30:15-19 }))] (EpaComments [])) (DataType) @@ -1064,7 +1064,7 @@ (Anchor { T17544.hs:31:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:31:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:31:10-11 }))] (EpaComments [])) [(L @@ -1132,10 +1132,10 @@ (Anchor { T17544.hs:34:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:34:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:34:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:34:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:34:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:34:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:34:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:34:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:34:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -1174,7 +1174,7 @@ (Anchor { T17544.hs:34:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:34:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:34:20-23 }))] (EpaComments [])) (DataFamily) @@ -1227,8 +1227,8 @@ (Anchor { T17544.hs:35:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:35:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:35:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:35:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:35:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1309,8 +1309,8 @@ (Anchor { T17544.hs:(36,3)-(37,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:36:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:36:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:36:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:36:15-19 }))] (EpaComments [])) (DataType) @@ -1324,7 +1324,7 @@ (Anchor { T17544.hs:37:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:37:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:37:10-11 }))] (EpaComments [])) [(L @@ -1392,10 +1392,10 @@ (Anchor { T17544.hs:40:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:40:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:40:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:40:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:40:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:40:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:40:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:40:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:40:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -1434,7 +1434,7 @@ (Anchor { T17544.hs:40:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:40:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:40:20-23 }))] (EpaComments [])) (DataFamily) @@ -1487,8 +1487,8 @@ (Anchor { T17544.hs:41:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:41:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:41:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:41:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:41:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1569,8 +1569,8 @@ (Anchor { T17544.hs:(42,3)-(43,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:42:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:42:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:42:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:42:15-19 }))] (EpaComments [])) (DataType) @@ -1584,7 +1584,7 @@ (Anchor { T17544.hs:43:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:43:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:43:10-11 }))] (EpaComments [])) [(L @@ -1652,10 +1652,10 @@ (Anchor { T17544.hs:46:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:46:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:46:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:46:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:46:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:46:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:46:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:46:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:46:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -1694,7 +1694,7 @@ (Anchor { T17544.hs:46:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:46:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:46:20-23 }))] (EpaComments [])) (DataFamily) @@ -1747,8 +1747,8 @@ (Anchor { T17544.hs:47:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:47:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:47:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:47:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:47:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1829,8 +1829,8 @@ (Anchor { T17544.hs:(48,3)-(49,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:48:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:48:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:48:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:48:15-19 }))] (EpaComments [])) (DataType) @@ -1844,7 +1844,7 @@ (Anchor { T17544.hs:49:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:49:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:49:10-11 }))] (EpaComments [])) [(L @@ -1912,10 +1912,10 @@ (Anchor { T17544.hs:52:1-32 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:52:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:52:13-17 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:52:19 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:52:32 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:52:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:52:13-17 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:52:19 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:52:32 }))] (EpaComments [])) (NoAnnSortKey) @@ -1954,7 +1954,7 @@ (Anchor { T17544.hs:52:21-30 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:52:21-24 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:52:21-24 }))] (EpaComments [])) (DataFamily) @@ -2007,8 +2007,8 @@ (Anchor { T17544.hs:53:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:53:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:53:18-22 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:53:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:53:18-22 }))] (EpaComments [])) (NoAnnSortKey)) @@ -2089,8 +2089,8 @@ (Anchor { T17544.hs:(54,3)-(55,20) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:54:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:54:16-20 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:54:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:54:16-20 }))] (EpaComments [])) (DataType) @@ -2104,7 +2104,7 @@ (Anchor { T17544.hs:55:5-20 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:55:11-12 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:55:11-12 }))] (EpaComments [])) [(L |