summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-09-29 09:47:11 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2011-09-29 09:47:11 +0100
commit642130293971bb8e59056601d537b40fa9ad4cfd (patch)
tree21bd18262e2c80ffb52a9a3107912fa8811d2580
parentf8e0e9ed2ddecb712c1f4be05d69448a21f3bf82 (diff)
downloadhaskell-642130293971bb8e59056601d537b40fa9ad4cfd.tar.gz
Wibbles to error messages following fix to Outputable.quotes
cf Trac #5509
-rw-r--r--testsuite/tests/ghci/scripts/ghci051.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_compile/T3208b.stderr4
-rw-r--r--testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr6
-rw-r--r--testsuite/tests/indexed-types/should_fail/T3330c.stderr2
-rw-r--r--testsuite/tests/rebindable/DoParamM.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/T3950.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail068.stderr4
7 files changed, 11 insertions, 11 deletions
diff --git a/testsuite/tests/ghci/scripts/ghci051.stderr b/testsuite/tests/ghci/scripts/ghci051.stderr
index e52b3edc24..3a78849813 100644
--- a/testsuite/tests/ghci/scripts/ghci051.stderr
+++ b/testsuite/tests/ghci/scripts/ghci051.stderr
@@ -1,5 +1,5 @@
<interactive>:7:9:
- Couldn't match expected type `T'' with actual type `T'
+ Couldn't match expected type T' with actual type `T'
In the expression: C :: T'
In an equation for `c': c = C :: T'
diff --git a/testsuite/tests/indexed-types/should_compile/T3208b.stderr b/testsuite/tests/indexed-types/should_compile/T3208b.stderr
index 712f732b06..2256e610e3 100644
--- a/testsuite/tests/indexed-types/should_compile/T3208b.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3208b.stderr
@@ -9,7 +9,7 @@ T3208b.hs:15:10:
Expected type: STerm a0
Actual type: OTerm a0
In the expression: fce (apply f)
- In an equation for `fce'': fce' f = fce (apply f)
+ In an equation for fce': fce' f = fce (apply f)
T3208b.hs:15:15:
Could not deduce (OTerm a0 ~ STerm a)
@@ -19,4 +19,4 @@ T3208b.hs:15:15:
at T3208b.hs:15:1-22
In the first argument of `fce', namely `(apply f)'
In the expression: fce (apply f)
- In an equation for `fce'': fce' f = fce (apply f)
+ In an equation for fce': fce' f = fce (apply f)
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr
index 5a9d279860..34e7cab285 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr
@@ -1,7 +1,7 @@
SimpleFail5b.hs:31:12:
Couldn't match expected type `Int' with actual type `Char'
- Expected type: S3 Int
- Actual type: S3 Char
+ Expected type: S3 Int
+ Actual type: S3 Char
In the pattern: D3Char
- In an equation for `bar3wrong'': bar3wrong' D3Char = 'a'
+ In an equation for bar3wrong': bar3wrong' D3Char = 'a'
diff --git a/testsuite/tests/indexed-types/should_fail/T3330c.stderr b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
index 4ca19f8a4e..e43c4652d8 100644
--- a/testsuite/tests/indexed-types/should_fail/T3330c.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
@@ -5,7 +5,7 @@ T3330c.hs:23:43:
a pattern with constructor
RSum :: forall (f :: * -> *) (g :: * -> *).
R f -> R g -> R (f :+: g),
- in an equation for `plug''
+ in an equation for plug'
at T3330c.hs:23:8
In the first argument of `plug', namely `rf'
In the first argument of `Inl', namely `(plug rf df x)'
diff --git a/testsuite/tests/rebindable/DoParamM.stderr b/testsuite/tests/rebindable/DoParamM.stderr
index 7abfdd4b56..7c095445e1 100644
--- a/testsuite/tests/rebindable/DoParamM.stderr
+++ b/testsuite/tests/rebindable/DoParamM.stderr
@@ -1,7 +1,7 @@
DoParamM.hs:146:25:
Couldn't match expected type `Int' with actual type `Char'
- In the second argument of `(==)', namely `v''
+ 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')
diff --git a/testsuite/tests/typecheck/should_fail/T3950.stderr b/testsuite/tests/typecheck/should_fail/T3950.stderr
index 1c326ad43e..bdecc12835 100644
--- a/testsuite/tests/typecheck/should_fail/T3950.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3950.stderr
@@ -3,5 +3,5 @@ T3950.hs:15:13:
Couldn't match expected type `Id p' with actual type `Id p x0'
Expected type: w (Id p)
Actual type: Sealed (Id p x0)
- In the first argument of `Just', namely `rp''
+ In the first argument of `Just', namely rp'
In the expression: Just rp'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
index afc671a8bf..1a7c840e0b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
@@ -56,7 +56,7 @@ tcfail068.hs:24:35:
at tcfail068.hs:24:29
Expected type: GHC.ST.ST s1 (IndTree s a)
Actual type: GHC.ST.ST s (IndTree s a)
- In the return type of a call of `itrap''
+ In the return type of a call of itrap'
In the first argument of `runST', namely `(itrap' i k)'
tcfail068.hs:36:46:
@@ -88,5 +88,5 @@ tcfail068.hs:36:46:
at tcfail068.hs:36:40
Expected type: GHC.ST.ST s1 (c, IndTree s b)
Actual type: GHC.ST.ST s (c, IndTree s b)
- In the return type of a call of `itrapstate''
+ In the return type of a call of itrapstate'
In the first argument of `runST', namely `(itrapstate' i k s)'