diff options
author | sheaf <sam.derbyshire@gmail.com> | 2022-09-13 10:22:05 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-09-13 10:27:53 -0400 |
commit | 362cca13858faf7e1158273780ea900e7dad5827 (patch) | |
tree | 468c06697b2a6ef3f65b79a469a131d279f71deb /testsuite/tests/rebindable | |
parent | 65a0bd69ac1fb59047cd4c8554a8fc756c7b3476 (diff) | |
download | haskell-362cca13858faf7e1158273780ea900e7dad5827.tar.gz |
Diagnostic codes: acccept test changes
The testsuite output now contains diagnostic codes, so many tests need
to be updated at once.
We decided it was best to keep the diagnostic codes in the testsuite
output, so that contributors don't inadvertently make changes to the
diagnostic codes.
Diffstat (limited to 'testsuite/tests/rebindable')
-rw-r--r-- | testsuite/tests/rebindable/DoParamM.stderr | 6 | ||||
-rw-r--r-- | testsuite/tests/rebindable/T20126.stderr | 2 | ||||
-rw-r--r-- | testsuite/tests/rebindable/rebindable11.stderr | 16 | ||||
-rw-r--r-- | testsuite/tests/rebindable/rebindable12.stderr | 6 | ||||
-rw-r--r-- | testsuite/tests/rebindable/rebindable6.stderr | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/testsuite/tests/rebindable/DoParamM.stderr b/testsuite/tests/rebindable/DoParamM.stderr index 41b56ecb07..012dad9035 100644 --- a/testsuite/tests/rebindable/DoParamM.stderr +++ b/testsuite/tests/rebindable/DoParamM.stderr @@ -1,11 +1,11 @@ -DoParamM.hs:146:25: error: +DoParamM.hs:146:25: error: [GHC-83865] • Couldn't match expected type ‘Int’ with actual type ‘Char’ • In the second argument of ‘(==)’, namely ‘v'’ In the first argument of ‘return’, namely ‘(v == v')’ In a stmt of a 'do' block: return (v == v') -DoParamM.hs:286:28: error: +DoParamM.hs:286:28: error: [GHC-83865] • Couldn't match type ‘Unlocked’ with ‘Locked’ Expected: LIO Locked Locked () Actual: LIO Unlocked Locked () @@ -18,7 +18,7 @@ DoParamM.hs:286:28: error: = do tlock2_do tlock2_do -DoParamM.hs:302:37: error: +DoParamM.hs:302:37: error: [GHC-83865] • Couldn't match type ‘Locked’ with ‘Unlocked’ Expected: LIO Unlocked Unlocked () Actual: LIO Locked Unlocked () diff --git a/testsuite/tests/rebindable/T20126.stderr b/testsuite/tests/rebindable/T20126.stderr index c23bab54e5..62789da490 100644 --- a/testsuite/tests/rebindable/T20126.stderr +++ b/testsuite/tests/rebindable/T20126.stderr @@ -1,5 +1,5 @@ -T20126.hs:13:7: error: +T20126.hs:13:7: error: [GHC-39999] • No instance for ‘Wombat ()’ arising from an if-then-else expression • In the expression: if True then () else () diff --git a/testsuite/tests/rebindable/rebindable11.stderr b/testsuite/tests/rebindable/rebindable11.stderr index 5a8acefd9f..07ff6692ab 100644 --- a/testsuite/tests/rebindable/rebindable11.stderr +++ b/testsuite/tests/rebindable/rebindable11.stderr @@ -1,48 +1,48 @@ -rebindable11.hs:10:19: error: +rebindable11.hs:10:19: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the expression: if 'a' then () else () In an equation for ‘foo’: foo = if 'a' then () else () -rebindable11.hs:11:10: error: +rebindable11.hs:11:10: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the first argument of ‘(*)’, namely ‘(if 'a' then () else ())’ In the first argument of ‘(+)’, namely ‘(if 'a' then () else ()) * 2’ -rebindable11.hs:12:9: error: +rebindable11.hs:12:9: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the expression: if 'a' then () else () In an equation for ‘a3’: a3 = if 'a' then () else () -rebindable11.hs:13:13: error: +rebindable11.hs:13:13: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the first argument of ‘(==)’, namely ‘(if 'a' then () else ())’ In the expression: (if 'a' then () else ()) == 10 -rebindable11.hs:14:17: error: +rebindable11.hs:14:17: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the body of a static form: (if 'a' then () else ()) In the expression: static (if 'a' then () else ()) -rebindable11.hs:15:10: error: +rebindable11.hs:15:10: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the expression: (if 'a' then () else ()) :: Int In an equation for ‘a6’: a6 = (if 'a' then () else ()) :: Int -rebindable11.hs:18:21: error: +rebindable11.hs:18:21: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the expression: 'a' In the ‘field’ field of a record In the expression: A {field = if 'a' then () else ()} -rebindable11.hs:19:53: error: +rebindable11.hs:19:53: error: [GHC-83865] • Couldn't match expected type ‘Bool’ with actual type ‘Char’ • In the second argument of ‘(==)’, namely ‘'a'’ In the expression: True == 'a' diff --git a/testsuite/tests/rebindable/rebindable12.stderr b/testsuite/tests/rebindable/rebindable12.stderr index e6c97e95f6..5a914418e8 100644 --- a/testsuite/tests/rebindable/rebindable12.stderr +++ b/testsuite/tests/rebindable/rebindable12.stderr @@ -1,5 +1,5 @@ -rebindable12.hs:10:5: - Couldn't match expected type ‘()’ with actual type ‘() -> ()’ - In the expression: if 'a' then () else () +rebindable12.hs:10:5: error: [GHC-83865] + • Couldn't match expected type ‘()’ with actual type ‘() -> ()’ + • In the expression: if 'a' then () else () In an equation for ‘y’: y = if 'a' then () else () diff --git a/testsuite/tests/rebindable/rebindable6.stderr b/testsuite/tests/rebindable/rebindable6.stderr index 1c9c3ee1e1..61cb0d9775 100644 --- a/testsuite/tests/rebindable/rebindable6.stderr +++ b/testsuite/tests/rebindable/rebindable6.stderr @@ -1,5 +1,5 @@ -rebindable6.hs:110:17: error: +rebindable6.hs:110:17: error: [GHC-39999] • Ambiguous type variable ‘t0’ arising from a do statement prevents the constraint ‘(HasSeq (IO a -> t0 -> IO b))’ from being solved. @@ -24,7 +24,7 @@ rebindable6.hs:110:17: error: Just (b :: b) <- g return b -rebindable6.hs:111:17: error: +rebindable6.hs:111:17: error: [GHC-39999] • Ambiguous type variables ‘p0’, ‘t0’ arising from a do statement prevents the constraint ‘(HasBind (IO (Maybe b) -> (Maybe b -> p0) -> t0))’ from being solved. @@ -49,7 +49,7 @@ rebindable6.hs:111:17: error: Just (b :: b) <- g return b -rebindable6.hs:112:17: error: +rebindable6.hs:112:17: error: [GHC-39999] • Ambiguous type variable ‘p0’ arising from a use of ‘return’ prevents the constraint ‘(HasReturn (b -> p0))’ from being solved. (maybe you haven't applied a function to enough arguments?) |