[commit: testsuite] master: Error message wibbles (7766065)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7766065f6538bc74c011ca876fe50e281052e511/testsuite

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

commit 7766065f6538bc74c011ca876fe50e281052e511
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 22 16:41:10 2013 +0000

    Error message wibbles


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

7766065f6538bc74c011ca876fe50e281052e511
 tests/ghci/scripts/T5564.stderr     |    2 +-
 tests/th/T5508.stderr               |    3 ++-
 tests/th/T5795.stderr               |    3 ++-
 tests/th/T5971.stderr               |    3 +--
 tests/th/T8412.stderr               |    3 +--
 tests/th/TH_unresolvedInfix2.stderr |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/ghci/scripts/T5564.stderr b/tests/ghci/scripts/T5564.stderr
index 6fb94e4..e24eacf 100644
--- a/tests/ghci/scripts/T5564.stderr
+++ b/tests/ghci/scripts/T5564.stderr
@@ -6,4 +6,4 @@
 <interactive>:5:1:
     Not in scope: ‛fit’
     Perhaps you meant one of these:
-      ‛it’ (line 4), ‛fst’ (imported from Prelude)
+      ‛fst’ (imported from Prelude), ‛it’ (line 4)
diff --git a/tests/th/T5508.stderr b/tests/th/T5508.stderr
index ff0383d..f1a553a 100644
--- a/tests/th/T5508.stderr
+++ b/tests/th/T5508.stderr
@@ -1,6 +1,7 @@
 T5508.hs:(7,9)-(9,28): Splicing expression
     do { let x = mkName "x"
              v = return (LamE [VarP x] $ VarE x);
-         [| $v . id |] }
+         [| $v . id |]
+         pending(rn) [(splice, v)] }
   ======>
     ((\ x -> x) . id)
diff --git a/tests/th/T5795.stderr b/tests/th/T5795.stderr
index dd909f1..7093492 100644
--- a/tests/th/T5795.stderr
+++ b/tests/th/T5795.stderr
@@ -3,4 +3,5 @@ T5795.hs:9:6:
     GHC stage restriction:
       ‛ty’ is used in a top-level splice or annotation,
       and must be imported, not defined locally
-    In the expression: ty
+    In the splice: $ty
+    To see what the splice expanded to, use -ddump-splices
diff --git a/tests/th/T5971.stderr b/tests/th/T5971.stderr
index 16eb00a..e6538c0 100644
--- a/tests/th/T5971.stderr
+++ b/tests/th/T5971.stderr
@@ -4,7 +4,6 @@ T5971.hs:6:7:
       Probable cause: you used a unique Template Haskell name (NameU), 
       perhaps via newName, but did not bind it
       If that's it, then -ddump-splices might be useful
-    In the result of the splice:
-      $(newName "x" >>= varE)
+    In the splice: $(newName "x" >>= varE)
     To see what the splice expanded to, use -ddump-splices
     In the expression: $(newName "x" >>= varE)
diff --git a/tests/th/T8412.stderr b/tests/th/T8412.stderr
index 21d43e4..8def784 100644
--- a/tests/th/T8412.stderr
+++ b/tests/th/T8412.stderr
@@ -1,6 +1,5 @@
 
 T8412.hs:5:12:
     Illegal literal in type (type literals must not be negative): -1
-    In the result of the splice:
-      $(return $ LitT $ NumTyLit (- 1))
+    In the splice: $(return $ LitT $ NumTyLit (- 1))
     To see what the splice expanded to, use -ddump-splices
diff --git a/tests/th/TH_unresolvedInfix2.stderr b/tests/th/TH_unresolvedInfix2.stderr
index 31f0605..30b1aa4 100644
--- a/tests/th/TH_unresolvedInfix2.stderr
+++ b/tests/th/TH_unresolvedInfix2.stderr
@@ -4,7 +4,7 @@ TH_unresolvedInfix2.hs:14:11:
         must have lower precedence than that of the operand,
           namely ‛:+’ [infixl 6]
         in the section: ‛:+ N :+ N’
-    In the result of the splice:
+    In the splice:
       $(let
           plus = conE ':+
           n = conE 'N