diff options
| author | Alfredo Di Napoli <alfredo@well-typed.com> | 2021-01-19 09:42:13 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-01-22 15:00:47 -0500 |
| commit | c36a4f6389e5607b1608682c2fcdb0866cac31d0 (patch) | |
| tree | eb76e2665ea6a5b87caded5745edfab99e280cae /testsuite/tests/rename | |
| parent | a64f21e9f6bd949847d3c8fa1e427e5c763ccd7f (diff) | |
| download | haskell-c36a4f6389e5607b1608682c2fcdb0866cac31d0.tar.gz | |
Fix tests relying on same-line diagnostic ordering
This commit fixes 19 tests which were failing due to the use of
`consBag` / `snocBag`, which have been now replaced by `addMessage`.
This means that now GHC would output things in different order but
only for /diagnostics on the same line/, so this is just reflecting
that. The "normal" order of messages is still guaranteed.
Diffstat (limited to 'testsuite/tests/rename')
| -rw-r--r-- | testsuite/tests/rename/should_compile/T2600.stderr | 7 | ||||
| -rw-r--r-- | testsuite/tests/rename/should_fail/rn_dup.stderr | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/testsuite/tests/rename/should_compile/T2600.stderr b/testsuite/tests/rename/should_compile/T2600.stderr index 91f594ff9e..ca675475cf 100644 --- a/testsuite/tests/rename/should_compile/T2600.stderr +++ b/testsuite/tests/rename/should_compile/T2600.stderr @@ -1,10 +1,11 @@ T2600.hs:16:1: warning: [-Winline-rule-shadowing (in -Wdefault)] Rule "myrule" may never fire - because rule "Class op tmap" for ‘tmap’ might fire first + because rule "Class op to" for ‘to’ might fire first Probable fix: add phase [n] or [~n] to the competing rule T2600.hs:16:1: warning: [-Winline-rule-shadowing (in -Wdefault)] Rule "myrule" may never fire - because rule "Class op to" for ‘to’ might fire first - Probable fix: add phase [n] or [~n] to the competing rule
\ No newline at end of file + because rule "Class op tmap" for ‘tmap’ might fire first + Probable fix: add phase [n] or [~n] to the competing rule + diff --git a/testsuite/tests/rename/should_fail/rn_dup.stderr b/testsuite/tests/rename/should_fail/rn_dup.stderr index ba8a9a56dc..5c4246d8b6 100644 --- a/testsuite/tests/rename/should_fail/rn_dup.stderr +++ b/testsuite/tests/rename/should_fail/rn_dup.stderr @@ -1,22 +1,22 @@ rn_dup.hs:9:10: error: Multiple declarations of ‘MkT’ - Declared at: rn_dup.hs:7:10 + Declared at: rn_dup.hs:7:16 rn_dup.hs:9:10 rn_dup.hs:9:10: error: Multiple declarations of ‘MkT’ - Declared at: rn_dup.hs:7:16 + Declared at: rn_dup.hs:7:10 rn_dup.hs:9:10 rn_dup.hs:12:16: error: Multiple declarations of ‘rf’ - Declared at: rn_dup.hs:11:16 + Declared at: rn_dup.hs:11:27 rn_dup.hs:12:16 rn_dup.hs:12:16: error: Multiple declarations of ‘rf’ - Declared at: rn_dup.hs:11:27 + Declared at: rn_dup.hs:11:16 rn_dup.hs:12:16 rn_dup.hs:17:3: error: |