[commit: ghc] wip/spj-wildcard-refactor: Error message wibbles (5e0727e)

[git at git.haskell.org]

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/5e0727e3f253fa4aaf991e03631fb7113bb15e88/ghc

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

commit 5e0727e3f253fa4aaf991e03631fb7113bb15e88
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 23 13:20:51 2015 +0000

    Error message wibbles


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

5e0727e3f253fa4aaf991e03631fb7113bb15e88
 testsuite/tests/monadfail/MonadFailErrors.stderr           | 14 +++++++-------
 .../should_fail/overloadedlabelsfail01.stderr              |  2 +-
 .../tests/typecheck/should_fail/CustomTypeErrors02.stderr  |  2 +-
 .../tests/typecheck/should_fail/CustomTypeErrors03.stderr  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testsuite/tests/monadfail/MonadFailErrors.stderr b/testsuite/tests/monadfail/MonadFailErrors.stderr
index 17807a4..960c84a 100644
--- a/testsuite/tests/monadfail/MonadFailErrors.stderr
+++ b/testsuite/tests/monadfail/MonadFailErrors.stderr
@@ -2,11 +2,11 @@
 MonadFailErrors.hs:16:5: error:
     Could not deduce (MonadFail m)
       arising from a do statement
-                   with the failable pattern ‘Just x’
+      with the failable pattern ‘Just x’
     from the context: Monad m
       bound by the type signature for:
                  general :: Monad m => m a
-      at MonadFailErrors.hs:14:12-25
+      at MonadFailErrors.hs:14:1-25
     Possible fix:
       add (MonadFail m) to the context of
         the type signature for:
@@ -23,7 +23,7 @@ MonadFailErrors.hs:16:5: error:
 MonadFailErrors.hs:30:5: error:
     No instance for (MonadFail Identity)
       arising from a do statement
-                   with the failable pattern ‘Just x’
+      with the failable pattern ‘Just x’
     In a stmt of a 'do' block: Just x <- undefined
     In the expression:
       do { Just x <- undefined;
@@ -36,7 +36,7 @@ MonadFailErrors.hs:30:5: error:
 MonadFailErrors.hs:44:5: error:
     No instance for (MonadFail (ST s))
       arising from a do statement
-                   with the failable pattern ‘Just x’
+      with the failable pattern ‘Just x’
     In a stmt of a 'do' block: Just x <- undefined
     In the expression:
       do { Just x <- undefined;
@@ -49,7 +49,7 @@ MonadFailErrors.hs:44:5: error:
 MonadFailErrors.hs:51:5: error:
     No instance for (MonadFail ((->) r))
       arising from a do statement
-                   with the failable pattern ‘Just x’
+      with the failable pattern ‘Just x’
     In a stmt of a 'do' block: Just x <- undefined
     In the expression:
       do { Just x <- undefined;
@@ -62,7 +62,7 @@ MonadFailErrors.hs:51:5: error:
 MonadFailErrors.hs:59:5: error:
     No instance for (MonadFail Identity)
       arising from a do statement
-                   with the failable pattern ‘Newtype x’
+      with the failable pattern ‘Newtype x’
     In a stmt of a 'do' block: Newtype x <- undefined
     In the expression:
       do { Newtype x <- undefined;
@@ -75,7 +75,7 @@ MonadFailErrors.hs:59:5: error:
 MonadFailErrors.hs:67:5: error:
     No instance for (MonadFail Identity)
       arising from a do statement
-                   with the failable pattern ‘Data x’
+      with the failable pattern ‘Data x’
     In a stmt of a 'do' block: Data x <- undefined
     In the expression:
       do { Data x <- undefined;
diff --git a/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr b/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr
index 1631c6d..b9d3bba 100644
--- a/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr
+++ b/testsuite/tests/overloadedrecflds/should_fail/overloadedlabelsfail01.stderr
@@ -26,6 +26,6 @@ overloadedlabelsfail01.hs:13:5: error:
     from the context: IsLabel "x" t
       bound by the type signature for:
                  c :: IsLabel "x" t => t
-      at overloadedlabelsfail01.hs:12:6-23
+      at overloadedlabelsfail01.hs:12:1-23
     In the expression: #y
     In an equation for ‘c’: c = #y
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
index 9ca22ee..b4d4c76 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
@@ -1,7 +1,7 @@
 
 CustomTypeErrors02.hs:17:1: error:
     The type 'a_aES -> a_aES' cannot be represented as an integer.
-    When checking that ‘err’ has the inferred type
+    When checking the inferred type
       err :: (TypeError ...)
 
 CustomTypeErrors02.hs:17:7: error:
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
index 330fadb..b1ceb26 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors03.stderr
@@ -1,5 +1,5 @@
 
 CustomTypeErrors03.hs:6:6: error:
     This is a type error
-    In the type signature for ‘f’:
+    In the type signature:
       f :: TypeError (Text "This is a type error")