Merge branch 'master' of http://darcs.haskell.org/testsuite

Conflicts:
	tests/typecheck/should_run/all.T

1 files changed, 19 insertions, 15 deletions

diff --git a/testsuite/tests/annotations/should_fail/annfail08.stderr b/testsuite/tests/annotations/should_fail/annfail08.stderr
index a97ca4e2b5..7e9b112dca 100644
--- a/testsuite/tests/annotations/should_fail/annfail08.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail08.stderr
@@ -1,15 +1,19 @@
-

-annfail08.hs:9:1:

-    No instance for (Data.Data.Data (a0 -> a0))

-      arising from an annotation

-    Possible fix:

-      add an instance declaration for (Data.Data.Data (a0 -> a0))

-    In the expression: (id + 1)

-    In the annotation: {-# ANN f (id + 1) #-}

-

-annfail08.hs:9:15:

-    No instance for (Num (a0 -> a0))

-      arising from a use of `+'

-    Possible fix: add an instance declaration for (Num (a0 -> a0))

-    In the expression: (id + 1)

-    In the annotation: {-# ANN f (id + 1) #-}

+
+annfail08.hs:9:1:
+    No instance for (Data.Data.Data (a0 -> a0))
+      arising from an annotation
+    The type variable `a0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Possible fix:
+      add an instance declaration for (Data.Data.Data (a0 -> a0))
+    In the expression: (id + 1)
+    In the annotation: {-# ANN f (id + 1) #-}
+
+annfail08.hs:9:15:
+    No instance for (Num (a0 -> a0))
+      arising from a use of `+'
+    The type variable `a0' is ambiguous
+    Possible fix: add a type signature that fixes these type variable(s)
+    Possible fix: add an instance declaration for (Num (a0 -> a0))
+    In the expression: (id + 1)
+    In the annotation: {-# ANN f (id + 1) #-}