[commit: testsuite] master: Error message wibbles (01b2050)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/01b205037c2307d09511174e209ae47b6746c0d8/testsuite

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

commit 01b205037c2307d09511174e209ae47b6746c0d8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Nov 7 13:27:02 2013 +0000

    Error message wibbles


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

01b205037c2307d09511174e209ae47b6746c0d8
 tests/annotations/should_fail/annfail03.stderr |    1 -
 tests/annotations/should_fail/annfail04.stderr |    1 -
 tests/annotations/should_fail/annfail05.stderr |    1 -
 tests/annotations/should_fail/annfail06.stderr |    1 -
 tests/annotations/should_fail/annfail07.stderr |    2 +-
 tests/annotations/should_fail/annfail08.stderr |    2 --
 tests/annotations/should_fail/annfail09.stderr |    1 -
 tests/annotations/should_fail/annfail10.stderr |    2 --
 tests/annotations/should_fail/annfail12.stderr |    4 +---
 9 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tests/annotations/should_fail/annfail03.stderr b/tests/annotations/should_fail/annfail03.stderr
index 9c15855..3993fe8 100644
--- a/tests/annotations/should_fail/annfail03.stderr
+++ b/tests/annotations/should_fail/annfail03.stderr
@@ -4,5 +4,4 @@ annfail03.hs:17:1:
       instance for ‛Data
                       InModule’ is used in a top-level splice or annotation,
       and must be imported, not defined locally
-    In the expression: InModule
     In the annotation: {-# ANN f InModule #-}
diff --git a/tests/annotations/should_fail/annfail04.stderr b/tests/annotations/should_fail/annfail04.stderr
index 9d7bf39..70ff2e6 100644
--- a/tests/annotations/should_fail/annfail04.stderr
+++ b/tests/annotations/should_fail/annfail04.stderr
@@ -4,5 +4,4 @@ annfail04.hs:14:12:
       instance for ‛Thing
                       Int’ is used in a top-level splice or annotation,
       and must be imported, not defined locally
-    In the expression: (thing :: Int)
     In the annotation: {-# ANN f (thing :: Int) #-}
diff --git a/tests/annotations/should_fail/annfail05.stderr b/tests/annotations/should_fail/annfail05.stderr
index 04329ee..712cff2 100644
--- a/tests/annotations/should_fail/annfail05.stderr
+++ b/tests/annotations/should_fail/annfail05.stderr
@@ -2,5 +2,4 @@
 annfail05.hs:11:1:
     No instance for (Data.Data.Data NoInstances)
       arising from an annotation
-    In the expression: NoInstances
     In the annotation: {-# ANN f NoInstances #-}
diff --git a/tests/annotations/should_fail/annfail06.stderr b/tests/annotations/should_fail/annfail06.stderr
index 332f35d..a807aaf 100644
--- a/tests/annotations/should_fail/annfail06.stderr
+++ b/tests/annotations/should_fail/annfail06.stderr
@@ -4,5 +4,4 @@ annfail06.hs:22:1:
       instance for ‛Data
                       InstancesInWrongModule’ is used in a top-level splice or annotation,
       and must be imported, not defined locally
-    In the expression: InstancesInWrongModule
     In the annotation: {-# ANN f InstancesInWrongModule #-}
diff --git a/tests/annotations/should_fail/annfail07.stderr b/tests/annotations/should_fail/annfail07.stderr
index 86a5799..5f966a7 100644
--- a/tests/annotations/should_fail/annfail07.stderr
+++ b/tests/annotations/should_fail/annfail07.stderr
@@ -2,4 +2,4 @@
 annfail07.hs:9:17:
     Couldn't match expected type ‛[a0]’ with actual type ‛Bool’
     In the first argument of ‛head’, namely ‛True’
-    In the expression: (head True)
+    In the annotation: {-# ANN f (head True) #-}
diff --git a/tests/annotations/should_fail/annfail08.stderr b/tests/annotations/should_fail/annfail08.stderr
index b902347..8a64c82 100644
--- a/tests/annotations/should_fail/annfail08.stderr
+++ b/tests/annotations/should_fail/annfail08.stderr
@@ -2,10 +2,8 @@
 annfail08.hs:9:1:
     No instance for (Data.Data.Data (a0 -> a0))
       arising from an annotation
-    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 ‛+’
-    In the expression: (id + 1)
     In the annotation: {-# ANN f (id + 1) #-}
diff --git a/tests/annotations/should_fail/annfail09.stderr b/tests/annotations/should_fail/annfail09.stderr
index 4bddab8..f1bd77c 100644
--- a/tests/annotations/should_fail/annfail09.stderr
+++ b/tests/annotations/should_fail/annfail09.stderr
@@ -3,5 +3,4 @@ annfail09.hs:11:11:
     GHC stage restriction:
       ‛g’ is used in a top-level splice or annotation,
       and must be imported, not defined locally
-    In the expression: g
     In the annotation: {-# ANN f g #-}
diff --git a/tests/annotations/should_fail/annfail10.stderr b/tests/annotations/should_fail/annfail10.stderr
index 2d32ac1..f9bfe26 100644
--- a/tests/annotations/should_fail/annfail10.stderr
+++ b/tests/annotations/should_fail/annfail10.stderr
@@ -11,7 +11,6 @@ annfail10.hs:9:1:
                Data.Data.Data (a, b, c)
         -- Defined in ‛Data.Data’
       ...plus 31 others
-    In the expression: 1
     In the annotation: {-# ANN f 1 #-}
 
 annfail10.hs:9:11:
@@ -23,5 +22,4 @@ annfail10.hs:9:11:
       instance Integral a => Num (GHC.Real.Ratio a)
         -- Defined in ‛GHC.Real’
       ...plus 11 others
-    In the expression: 1
     In the annotation: {-# ANN f 1 #-}
diff --git a/tests/annotations/should_fail/annfail12.stderr b/tests/annotations/should_fail/annfail12.stderr
index 6b08c0a..b3cbb4e 100644
--- a/tests/annotations/should_fail/annfail12.stderr
+++ b/tests/annotations/should_fail/annfail12.stderr
@@ -2,7 +2,5 @@
 annfail12.hs:5:1:
     Exception when trying to run compile-time code:
       You were meant to see this error!
-    In the expression:
-        (error "You were meant to see this error!" :: Int)
     In the annotation:
-        {-# ANN f (error "You were meant to see this error!" :: Int) #-}
+      {-# ANN f (error "You were meant to see this error!" :: Int) #-}