[commit: testsuite] master: Error message wibbles (653ee4b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/653ee4b32c77945d4d4550e60e7bfc14257afc0b/testsuite

>---------------------------------------------------------------

commit 653ee4b32c77945d4d4550e60e7bfc14257afc0b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Dec 28 12:51:19 2013 +0000

    Error message wibbles


>---------------------------------------------------------------

653ee4b32c77945d4d4550e60e7bfc14257afc0b
 tests/indexed-types/should_compile/Simple14.stderr  |    6 +++---
 tests/indexed-types/should_fail/T5439.stderr        |    4 ++--
 tests/typecheck/should_compile/T2494.stderr         |   12 ++++++------
 tests/typecheck/should_fail/FrozenErrorTests.stderr |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/indexed-types/should_compile/Simple14.stderr b/tests/indexed-types/should_compile/Simple14.stderr
index 3c761c3..ed94ad5 100644
--- a/tests/indexed-types/should_compile/Simple14.stderr
+++ b/tests/indexed-types/should_compile/Simple14.stderr
@@ -1,14 +1,14 @@
 
 Simple14.hs:17:19:
-    Couldn't match type ‛z0’ with ‛n’
+    Couldn't match type ‛z0’ with ‛m’
       ‛z0’ is untouchable
         inside the constraints (Maybe m ~ Maybe n)
         bound by a type expected by the context:
                    Maybe m ~ Maybe n => EQ_ z0 z0
         at Simple14.hs:17:12-33
-      ‛n’ is a rigid type variable bound by
+      ‛m’ is a rigid type variable bound by
           the type signature for foo :: EQ_ (Maybe m) (Maybe n)
-          at Simple14.hs:16:17
+          at Simple14.hs:16:15
     Expected type: EQ_ z0 z0
       Actual type: EQ_ m n
     Relevant bindings include
diff --git a/tests/indexed-types/should_fail/T5439.stderr b/tests/indexed-types/should_fail/T5439.stderr
index ea7c6c5..90f4774 100644
--- a/tests/indexed-types/should_fail/T5439.stderr
+++ b/tests/indexed-types/should_fail/T5439.stderr
@@ -1,7 +1,7 @@
 
 T5439.hs:83:28:
-    Couldn't match type ‛Attempt t0 -> Attempt (HElemOf l0)’
-                  with ‛Attempt (HElemOf rs)’
+    Couldn't match type ‛Attempt (HNth n0 l0) -> Attempt (HElemOf l0)’
+                  with ‛Attempt (WaitOpResult (WaitOps rs))’
     Expected type: f (Attempt (HNth n0 l0) -> Attempt (HElemOf l0))
       Actual type: f (Attempt (WaitOpResult (WaitOps rs)))
     Relevant bindings include
diff --git a/tests/typecheck/should_compile/T2494.stderr b/tests/typecheck/should_compile/T2494.stderr
index 7f1a2b0..201230b 100644
--- a/tests/typecheck/should_compile/T2494.stderr
+++ b/tests/typecheck/should_compile/T2494.stderr
@@ -1,10 +1,10 @@
 
 T2494.hs:15:14:
-    Couldn't match type ‛a’ with ‛b’
-      ‛a’ is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:13:16
+    Couldn't match type ‛b’ with ‛a’
       ‛b’ is a rigid type variable bound by
           the RULE "foo/foo" at T2494.hs:14:16
+      ‛a’ is a rigid type variable bound by
+          the RULE "foo/foo" at T2494.hs:13:16
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
     Relevant bindings include
@@ -17,11 +17,11 @@ T2494.hs:15:14:
     In the second argument of ‛foo’, namely ‛(foo g x)’
 
 T2494.hs:15:30:
-    Couldn't match type ‛a’ with ‛b’
-      ‛a’ is a rigid type variable bound by
-          the RULE "foo/foo" at T2494.hs:13:16
+    Couldn't match type ‛b’ with ‛a’
       ‛b’ is a rigid type variable bound by
           the RULE "foo/foo" at T2494.hs:14:16
+      ‛a’ is a rigid type variable bound by
+          the RULE "foo/foo" at T2494.hs:13:16
     Expected type: Maybe (m a) -> Maybe (m a)
       Actual type: Maybe (m b) -> Maybe (m b)
     Relevant bindings include
diff --git a/tests/typecheck/should_fail/FrozenErrorTests.stderr b/tests/typecheck/should_fail/FrozenErrorTests.stderr
index 9857c9c..471643b 100644
--- a/tests/typecheck/should_fail/FrozenErrorTests.stderr
+++ b/tests/typecheck/should_fail/FrozenErrorTests.stderr
@@ -27,7 +27,7 @@ FrozenErrorTests.hs:29:15:
     In an equation for ‛test2’: test2 = goo2 (goo1 False undefined)
 
 FrozenErrorTests.hs:30:9:
-    Couldn't match type ‛Int’ with ‛[Int]’
+    Couldn't match type ‛[Int]’ with ‛Int’
     Expected type: [[Int]]
       Actual type: F [Int] Bool
     In the expression: goo1 False (goo2 undefined)