[commit: testsuite] master: Error message improvements (9fa51f9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/testsuite

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9fa51f9fcbd17dda6e8d5ca8b91f0cdfaeddb209/testsuite

>---------------------------------------------------------------

commit 9fa51f9fcbd17dda6e8d5ca8b91f0cdfaeddb209
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 22 16:40:36 2013 +0000

    Error message improvements


>---------------------------------------------------------------

9fa51f9fcbd17dda6e8d5ca8b91f0cdfaeddb209
 tests/annotations/should_fail/annfail01.stderr |    8 ++++++--
 tests/annotations/should_fail/annfail02.stderr |    8 ++++++--
 tests/annotations/should_fail/annfail03.stderr |    5 ++---
 tests/annotations/should_fail/annfail11.stderr |   10 ++++++++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/tests/annotations/should_fail/annfail01.stderr b/tests/annotations/should_fail/annfail01.stderr
index 160575c..6cafc25 100644
--- a/tests/annotations/should_fail/annfail01.stderr
+++ b/tests/annotations/should_fail/annfail01.stderr
@@ -1,4 +1,8 @@
 
-annfail01.hs:4:1: Not in scope: type constructor or class ‛Foo’
+annfail01.hs:4:1:
+    Not in scope: type constructor or class ‛Foo’
+    In the annotation: {-# ANN type Foo (1 :: Int) #-}
 
-annfail01.hs:5:1: Not in scope: ‛f’
+annfail01.hs:5:1:
+    Not in scope: ‛f’
+    In the annotation: {-# ANN f (1 :: Int) #-}
diff --git a/tests/annotations/should_fail/annfail02.stderr b/tests/annotations/should_fail/annfail02.stderr
index 21f7aff..84c9548 100644
--- a/tests/annotations/should_fail/annfail02.stderr
+++ b/tests/annotations/should_fail/annfail02.stderr
@@ -1,4 +1,8 @@
 
-annfail02.hs:6:1: Not in scope: data constructor ‛Foo’
+annfail02.hs:6:1:
+    Not in scope: data constructor ‛Foo’
+    In the annotation: {-# ANN Foo (1 :: Int) #-}
 
-annfail02.hs:7:1: Not in scope: type constructor or class ‛Bar’
+annfail02.hs:7:1:
+    Not in scope: type constructor or class ‛Bar’
+    In the annotation: {-# ANN type Bar (2 :: Int) #-}
diff --git a/tests/annotations/should_fail/annfail03.stderr b/tests/annotations/should_fail/annfail03.stderr
index 3993fe8..7e880d4 100644
--- a/tests/annotations/should_fail/annfail03.stderr
+++ b/tests/annotations/should_fail/annfail03.stderr
@@ -1,7 +1,6 @@
 
-annfail03.hs:17:1:
+annfail03.hs:17:11:
     GHC stage restriction:
-      instance for ‛Data
-                      InModule’ is used in a top-level splice or annotation,
+      ‛InModule’ is used in a top-level splice or annotation,
       and must be imported, not defined locally
     In the annotation: {-# ANN f InModule #-}
diff --git a/tests/annotations/should_fail/annfail11.stderr b/tests/annotations/should_fail/annfail11.stderr
index 39ff0e8..3fa446f 100644
--- a/tests/annotations/should_fail/annfail11.stderr
+++ b/tests/annotations/should_fail/annfail11.stderr
@@ -1,4 +1,10 @@
 
-annfail11.hs:3:1: Not in scope: ‛length’
+annfail11.hs:3:1:
+    Not in scope: ‛length’
+    In the annotation:
+      {-# ANN length "Cannot annotate other modules yet" #-}
 
-annfail11.hs:4:1: Not in scope: type constructor or class ‛Integer’
+annfail11.hs:4:1:
+    Not in scope: type constructor or class ‛Integer’
+    In the annotation:
+      {-# ANN type Integer "Cannot annotate other modules yet" #-}