A ton of error message wibbles

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

1 files changed, 14 insertions, 6 deletions

diff --git a/testsuite/tests/rebindable/rebindable6.stderr b/testsuite/tests/rebindable/rebindable6.stderr
index f380db4446..5130968c02 100644
--- a/testsuite/tests/rebindable/rebindable6.stderr
+++ b/testsuite/tests/rebindable/rebindable6.stderr
@@ -4,11 +4,14 @@ rebindable6.hs:106:17:
       arising from a do statement
     The type variable `t0' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      test_do :: IO a -> IO (Maybe b) -> IO b
+        (bound at rebindable6.hs:104:9)
+      f :: IO a (bound at rebindable6.hs:104:17)
+      g :: IO (Maybe b) (bound at rebindable6.hs:104:19)
     Note: there is a potential instance available:
       instance HasSeq (IO a -> IO b -> IO b)
         -- Defined at rebindable6.hs:52:18
-    Possible fix:
-      add an instance declaration for (HasSeq (IO a -> t0 -> IO b))
     In a stmt of a 'do' block: f
     In the expression:
       do { f;
@@ -25,12 +28,13 @@ rebindable6.hs:107:17:
       arising from a do statement
     The type variables `t0', `t1' are ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      test_do :: IO a -> IO (Maybe b) -> IO b
+        (bound at rebindable6.hs:104:9)
+      g :: IO (Maybe b) (bound at rebindable6.hs:104:19)
     Note: there is a potential instance available:
       instance HasBind (IO a -> (a -> IO b) -> IO b)
         -- Defined at rebindable6.hs:47:18
-    Possible fix:
-      add an instance declaration for
-      (HasBind (IO (Maybe b) -> (Maybe b -> t1) -> t0))
     In a stmt of a 'do' block: Just (b :: b) <- g
     In the expression:
       do { f;
@@ -47,9 +51,13 @@ rebindable6.hs:108:17:
       arising from a use of `return'
     The type variable `t1' is ambiguous
     Possible fix: add a type signature that fixes these type variable(s)
+    Relevant bindings include
+      test_do :: IO a -> IO (Maybe b) -> IO b
+        (bound at rebindable6.hs:104:9)
+      g :: IO (Maybe b) (bound at rebindable6.hs:104:19)
+      b :: b (bound at rebindable6.hs:107:23)
     Note: there is a potential instance available:
       instance HasReturn (a -> IO a) -- Defined at rebindable6.hs:42:18
-    Possible fix: add an instance declaration for (HasReturn (b -> t1))
     In a stmt of a 'do' block: return b
     In the expression:
       do { f;