A ton of error message wibbles

Notably
 * Showing relevant bindings
 * Not suggesting add instance (Num T); see Trac #7222

1 files changed, 22 insertions, 5 deletions

diff --git a/testsuite/tests/indexed-types/should_fail/T2544.stderr b/testsuite/tests/indexed-types/should_fail/T2544.stderr
index b6bc222fa0..bd816720c3 100644
--- a/testsuite/tests/indexed-types/should_fail/T2544.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2544.stderr
@@ -1,13 +1,30 @@
 
-T2544.hs:15:12:
-    Could not deduce (IxMap r ~ IxMap i1)
+T2544.hs:15:18:
+    Could not deduce (IxMap i0 ~ IxMap l)
+    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
+    The type variable `i0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Expected type: IxMap l [Int]
+      Actual type: IxMap i0 [Int]
+    Relevant bindings include
+      empty :: IxMap (l :|: r) [Int] (bound at T2544.hs:15:4)
+    In the first argument of `BiApp', namely `empty'
+    In the expression: BiApp empty empty
+    In an equation for `empty': empty = BiApp empty empty
+
+T2544.hs:15:24:
+    Could not deduce (IxMap i1 ~ IxMap r)
     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
     The type variable `i1' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
-    Expected type: IxMap (l :|: r) [Int]
-      Actual type: BiApp (IxMap i0) (IxMap i1) [Int]
-    In the return type of a call of `BiApp'
+    Expected type: IxMap r [Int]
+      Actual type: IxMap i1 [Int]
+    Relevant bindings include
+      empty :: IxMap (l :|: r) [Int] (bound at T2544.hs:15:4)
+    In the second argument of `BiApp', namely `empty'
     In the expression: BiApp empty empty
     In an equation for `empty': empty = BiApp empty empty