Wibbles to error messages, following the fix for Trac #7851

In effect, the error context for naked variables now takes up
a "slot" in the context stack; but it is often empty.  So the
context stack becomes one shorter in those cases.  I don't think
this matters; indeed, it's aguably an improvement.  Anyway that's
why so many tests are affected.

1 files changed, 18 insertions, 19 deletions

diff --git a/testsuite/tests/typecheck/should_fail/mc25.stderr b/testsuite/tests/typecheck/should_fail/mc25.stderr
index 52b40c75dd..042de5b620 100644
--- a/testsuite/tests/typecheck/should_fail/mc25.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc25.stderr
@@ -1,19 +1,18 @@
-

-mc25.hs:9:24:

-    No instance for (Functor t1) arising from a use of ‛fmap’

-    Possible fix:

-      add (Functor t1) to the context of

-        a type expected by the context: (a -> b) -> t1 a -> t1 b

-        or the inferred type of z :: [t1 t]

-    In the expression: fmap

-    In a stmt of a monad comprehension: then group by x using take

-    In the expression: [x | x <- [1 .. 10], then group by x using take]

-

-mc25.hs:9:46:

-    Couldn't match type ‛Int’ with ‛a -> t’

-    Expected type: (a -> t) -> [a] -> [t1 a]

-      Actual type: Int -> [a] -> [a]

-    Relevant bindings include z :: [t1 t] (bound at mc25.hs:9:1)

-    In the expression: take

-    In a stmt of a monad comprehension: then group by x using take

-    In the expression: [x | x <- [1 .. 10], then group by x using take]

+
+mc25.hs:9:24:
+    No instance for (Functor t1) arising from a use of ‛fmap’
+    Possible fix:
+      add (Functor t1) to the context of
+        a type expected by the context: (a -> b) -> t1 a -> t1 b
+        or the inferred type of z :: [t1 t]
+    In the expression: fmap
+    In a stmt of a monad comprehension: then group by x using take
+    In the expression: [x | x <- [1 .. 10], then group by x using take]
+
+mc25.hs:9:46:
+    Couldn't match type ‛Int’ with ‛a -> t’
+    Expected type: (a -> t) -> [a] -> [t1 a]
+      Actual type: Int -> [a] -> [a]
+    Relevant bindings include z :: [t1 t] (bound at mc25.hs:9:1)
+    In the expression: take
+    In a stmt of a monad comprehension: then group by x using take