summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-05-09 11:37:40 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2011-05-09 11:37:40 +0100
commitd779ff38a3887772f7663ab33cc704e265cd3610 (patch)
tree8cb34a9e1324a5c6efb09441189867c27b348780 /testsuite/tests
parent0ad3cf34b27880d7f2e3c77eecf832d560723899 (diff)
downloadhaskell-d779ff38a3887772f7663ab33cc704e265cd3610.tar.gz
Track monad-comp error message changes
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr2
-rw-r--r--testsuite/tests/ghc-regress/rebindable/DoParamM.stderr6
2 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr b/testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr
index 2eccd9159f..6ee1facfdc 100644
--- a/testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr
+++ b/testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr
@@ -1,2 +1,2 @@
-prog011.hx:14:22: Empty 'do' construct
+prog011.hx:14:22: Empty 'do' block
diff --git a/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr b/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
index 8e228d9adf..7abfdd4b56 100644
--- a/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
+++ b/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
@@ -3,13 +3,13 @@ DoParamM.hs:146:25:
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 the expression: return (v == v')
+ In a stmt of a 'do' block: return (v == v')
DoParamM.hs:286:28:
Couldn't match expected type `Locked' with actual type `Unlocked'
Expected type: LIO Locked r0 b0
Actual type: LIO Unlocked Locked ()
- In the expression: tlock2_do
+ In a stmt of a 'do' block: tlock2_do
In the expression:
do { tlock2_do;
tlock2_do }
@@ -18,7 +18,7 @@ DoParamM.hs:302:37:
Couldn't match expected type `Unlocked' with actual type `Locked'
Expected type: LIO Unlocked r0 b0
Actual type: LIO Locked Unlocked ()
- In the expression: unlock
+ In a stmt of a 'do' block: unlock
In the expression:
do { tlock2_do;
unlock;