[commit: ghc] master: Adjust error message slightly (4f35646)

Tue Jun 14 06:53:09 UTC 2016

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4f356466b733e51e72c92df4c7fce6b967e4ea5e/ghc

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

commit 4f356466b733e51e72c92df4c7fce6b967e4ea5e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jun 14 07:55:01 2016 +0100

    Adjust error message slightly


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

4f356466b733e51e72c92df4c7fce6b967e4ea5e
 compiler/typecheck/TcBinds.hs                          | 4 ++--
 testsuite/tests/typecheck/should_compile/T11339.stderr | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index 10d5901..4517b73 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -955,7 +955,7 @@ checkOverloadedSig monomorphism_restriction_applies sig
   , let orig_sig = sig_inst_sig sig
   = setSrcSpan (sig_loc orig_sig) $
     failWith $
-    hang (text "Illegal overloaded signature conflicts with monomorphism restriction")
+    hang (text "Overloaded signature conflicts with monomorphism restriction")
        2 (ppr orig_sig)
   | otherwise
   = return ()
@@ -1484,7 +1484,7 @@ For (2) it would look like
     in <body>
 
 We typecheck pattern bindings as follows:
-  1. In tcLhs we bind q'::alpha, for each varibable q bound by the
+  1. In tcLhs we bind q'::alpha, for each variable q bound by the
      pattern, where q' is a fresh name, and alpha is a fresh
      unification variable; it will be the monomorphic verion of q that
      we later generalise
diff --git a/testsuite/tests/typecheck/should_compile/T11339.stderr b/testsuite/tests/typecheck/should_compile/T11339.stderr
index 9e8a8ec..b43c45f 100644
--- a/testsuite/tests/typecheck/should_compile/T11339.stderr
+++ b/testsuite/tests/typecheck/should_compile/T11339.stderr
@@ -1,6 +1,6 @@
 
 T11339.hs:15:5: error:
-    • Illegal overloaded signature conflicts with monomorphism restriction
+    • Overloaded signature conflicts with monomorphism restriction
         t :: forall (f :: * -> *). Applicative f => (a -> f b) -> f t
     • In an equation for ‘failing’:
           failing left right afb s

