Error message wibbles

6 files changed, 25 insertions, 25 deletions

diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index 5afb822c32..a41b6fe994 100644
--- a/testsuite/tests/indexed-types/should_compile/T3017.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr
@@ -1,7 +1,7 @@
 TYPE SIGNATURES
     emptyL :: forall a. ListColl a
     test2 :: forall c t t1.
-             (Num t, Num t1, Coll c, Elem c ~ (t, t1)) =>
+             (Num t1, Num t, Coll c, Elem c ~ (t, t1)) =>
              c -> c
 TYPE CONSTRUCTORS
   data ListColl a
diff --git a/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
index 38c8cf6b2f..713afea184 100644
--- a/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
@@ -1,13 +1,13 @@
-

-NoMatchErr.hs:20:12:

-    Could not deduce (Memo d0 ~ Memo d)

-    from the context (Fun d)

-      bound by the type signature for f :: Fun d => Memo d a -> Memo d a

-      at NoMatchErr.hs:20:1-15

-    NB: `Memo' is a type function, and may not be injective

-    Expected type: Memo d a

-      Actual type: Memo d0 a

-    Expected type: Memo d a -> d0 -> a

-      Actual type: Memo d0 a -> d0 -> a

-    In the second argument of `(.)', namely `appl'

-    In the expression: abst . appl

+
+NoMatchErr.hs:20:5:
+    Could not deduce (Memo d ~ Memo d0)
+    from the context (Fun d)
+      bound by the type signature for f :: Fun d => Memo d a -> Memo d a
+      at NoMatchErr.hs:20:1-15
+    NB: `Memo' is a type function, and may not be injective
+    Expected type: Memo d a
+      Actual type: Memo d0 a
+    Expected type: Memo d a -> Memo d a
+      Actual type: Memo d0 a -> Memo d0 a
+    In the expression: abst . appl
+    In an equation for `f': f = abst . appl
diff --git a/testsuite/tests/indexed-types/should_fail/T2544.stderr b/testsuite/tests/indexed-types/should_fail/T2544.stderr
index 6c977bf833..d25e4b0ba0 100644
--- a/testsuite/tests/indexed-types/should_fail/T2544.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2544.stderr
@@ -1,12 +1,12 @@
 
-T2544.hs:15:18:
-    Could not deduce (IxMap i0 ~ IxMap l)
+T2544.hs:15:12:
+    Could not deduce (IxMap l ~ IxMap i0)
     from the context (Ix l, Ix r)
       bound by the instance declaration at T2544.hs:13:10-37
     NB: `IxMap' is a type function, and may not be injective
-    Expected type: IxMap l [Int]
-      Actual type: IxMap i0 [Int]
-    In the first argument of `BiApp', namely `empty'
+    Expected type: IxMap (l :|: r) [Int]
+      Actual type: BiApp (IxMap i0) (IxMap r) [Int]
+    In the return type of a call of `BiApp'
     In the expression: BiApp empty empty
     In an equation for `empty': empty = BiApp empty empty
 
diff --git a/testsuite/tests/indexed-types/should_fail/T2627b.stderr b/testsuite/tests/indexed-types/should_fail/T2627b.stderr
index a8e232486b..c0e03ce828 100644
--- a/testsuite/tests/indexed-types/should_fail/T2627b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2627b.stderr
@@ -1,7 +1,7 @@
 
 T2627b.hs:20:24:
     Occurs check: cannot construct the infinite type:
-      a0 = Dual (Dual a0)
+      b0 = Dual (Dual b0)
     In the expression: conn undefined undefined
     In an equation for `conn':
         conn (Rd k) (Wr a r) = conn undefined undefined
diff --git a/testsuite/tests/indexed-types/should_fail/T4099.stderr b/testsuite/tests/indexed-types/should_fail/T4099.stderr
index 1f5a917296..4d1935678b 100644
--- a/testsuite/tests/indexed-types/should_fail/T4099.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4099.stderr
@@ -1,6 +1,6 @@
 
 T4099.hs:11:14:
-    Couldn't match type `T b' with `T a0'
+    Couldn't match type `T a0' with `T b'
     NB: `T' is a type function, and may not be injective
     In the first argument of `foo', namely `x'
     In the expression: foo x
diff --git a/testsuite/tests/simplCore/should_compile/T3234.stderr b/testsuite/tests/simplCore/should_compile/T3234.stderr
index 7aa09b7e4e..c4e601dfd1 100644
--- a/testsuite/tests/simplCore/should_compile/T3234.stderr
+++ b/testsuite/tests/simplCore/should_compile/T3234.stderr
@@ -14,7 +14,7 @@ Total ticks:     45
 
 14 PreInlineUnconditionally
     1 n
-    1 a1
+    1 a
     1 g
     1 xs
     1 ys
@@ -24,7 +24,7 @@ Total ticks:     45
     1 g
     1 h
     1 n
-    1 a1
+    1 a
     1 lvl
     1 lvl
 2 PostInlineUnconditionally
@@ -41,7 +41,7 @@ Total ticks:     45
 1 LetFloatFromLet
     1
 22 BetaReduction
-    1 a1
+    1 a
     1 b
     1 a
     1 g
@@ -62,7 +62,7 @@ Total ticks:     45
     1 b
     1 c
     1 n
-    1 a1
+    1 a
 10 SimplifierDone
     10