Follow error message wibbles

testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr

 
 T3621.hs:21:21:
-    No instance for (MonadState state (State s))
-      arising from the 'deriving' clause of a data type declaration
-    Possible fix:
-      add an instance declaration for (MonadState state (State s))
-      or use a standalone 'deriving instance' declaration,
-           so you can specify the instance context yourself
+    Couldn't match type `s' with `state'
+      `s' is an unknown type variable
+      `state' is an unknown type variable
+    When using functional dependencies to combine
+      MonadState s (State s),
+        arising from the dependency `m -> s'
+        in the instance declaration at T3621.hs:18:10
+      MonadState state (State s),
+        arising from the 'deriving' clause of a data type declaration
+        at T3621.hs:21:21-36
     When deriving the instance for (MonadState state (WrappedState s))

testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.stderr

-
-Gentle.hs:17:9:
-    Could not deduce (Show a) arising from a use of `bar'
-    from the context (Concrete a b)
-      bound by the type signature for wib :: Concrete a b => a -> String
-      at Gentle.hs:17:1-13
-    Possible fix:
-      add (Show a) to the context of
-        the type signature for wib :: Concrete a b => a -> String
-    In the expression: bar x
-    In an equation for `wib': wib x = bar x

testsuite/tests/ghc-regress/indexed-types/should_compile/all.T

@@ -117,7 +117,7 @@ test('GivenCheckDecomp', normal, compile, [''])
 test('GivenCheckTop', normal, compile, [''])
 
 # A very delicate test
-test('Gentle', normal, compile_fail, [''])
+test('Gentle', normal, compile, [''])
 
 test('T1981', normal, compile, [''])
 test('T2238', expect_fail, compile, [''])

testsuite/tests/ghc-regress/indexed-types/should_fail/T4254.stderr

+
+T4254.hs:19:10:
+    Could not deduce (b ~ Bool)
+    from the context (a ~ Int, FD a b)
+      bound by the type signature for
+                 fails :: (a ~ Int, FD a b) => a -> Bool
+      at T4254.hs:19:1-11
+      `b' is a rigid type variable bound by
+          the type signature for fails :: (a ~ Int, FD a b) => a -> Bool
+          at T4254.hs:19:1
+    When using functional dependencies to combine
+      FD Int b,
+        arising from the type signature for
+                       fails :: (a ~ Int, FD a b) => a -> Bool
+        at T4254.hs:19:1-11
+      FD Int Bool, arising from a use of `op' at T4254.hs:19:10-11
+    In the expression: op
+    In an equation for `fails': fails = op

testsuite/tests/ghc-regress/indexed-types/should_fail/all.T

@@ -60,7 +60,7 @@ test('T3330a', reqlib('mtl'), compile_fail, [''])
 test('T3330b', normal, compile_fail, [''])
 test('T3330c', normal, compile_fail, [''])
 test('T4179', normal, compile_fail, [''])
-test('T4254', normal, compile, [''])
+test('T4254', normal, compile_fail, [''])
 test('T2239', normal, compile_fail, [''])
 test('T3440', normal, compile_fail, [''])
 test('T4485', normal, compile_fail, [''])

testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr

@@ -9,47 +9,3 @@ tcfail143.hs:29:9:
         arising from a use of `extend' at tcfail143.hs:29:9-16
     In the expression: n1 `extend` n0
     In an equation for `t2': t2 = n1 `extend` n0
-
-tcfail143.hs:29:9:
-    Couldn't match type `Z' with `S Z'
-    When using functional dependencies to combine
-      MinMax Z Z Z Z,
-        arising from the dependency `b c d -> a'
-        in the instance declaration at tcfail143.hs:10:10
-      MinMax (S Z) Z Z Z,
-        arising from a use of `extend' at tcfail143.hs:29:9-16
-    In the expression: n1 `extend` n0
-    In an equation for `t2': t2 = n1 `extend` n0
-
-tcfail143.hs:29:9:
-    Couldn't match type `Z' with `S Z'
-    When using functional dependencies to combine
-      MinMax a Z Z a,
-        arising from the dependency `b c d -> a'
-        in the instance declaration at tcfail143.hs:11:10
-      MinMax (S Z) Z Z Z,
-        arising from a use of `extend' at tcfail143.hs:29:9-16
-    In the expression: n1 `extend` n0
-    In an equation for `t2': t2 = n1 `extend` n0
-
-tcfail143.hs:29:9:
-    Couldn't match type `Z' with `S Z'
-    When using functional dependencies to combine
-      MinMax Z b Z b,
-        arising from the dependency `b c d -> a'
-        in the instance declaration at tcfail143.hs:12:10
-      MinMax (S Z) Z Z Z,
-        arising from a use of `extend' at tcfail143.hs:29:9-16
-    In the expression: n1 `extend` n0
-    In an equation for `t2': t2 = n1 `extend` n0
-
-tcfail143.hs:29:9:
-    Couldn't match type `S Z' with `Z'
-    When using functional dependencies to combine
-      MinMax a Z Z a,
-        arising from the dependency `a b -> c d'
-        in the instance declaration at tcfail143.hs:11:10
-      MinMax (S Z) Z Z Z,
-        arising from a use of `extend' at tcfail143.hs:29:9-16
-    In the expression: n1 `extend` n0
-    In an equation for `t2': t2 = n1 `extend` n0