[commit: ghc] master: Clarify error message. See #9167. (1153194)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1153194ca1ec867ca01675a902cdf7dab72b5dab/ghc

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

commit 1153194ca1ec867ca01675a902cdf7dab72b5dab
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Jun 10 14:31:04 2014 -0400

    Clarify error message. See #9167.


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

1153194ca1ec867ca01675a902cdf7dab72b5dab
 compiler/typecheck/TcTyClsDecls.lhs                    | 2 +-
 testsuite/tests/indexed-types/should_fail/T2888.stderr | 2 +-
 testsuite/tests/indexed-types/should_fail/T9167.stderr | 2 +-
 testsuite/tests/typecheck/should_fail/tcfail116.stderr | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.lhs b/compiler/typecheck/TcTyClsDecls.lhs
index 4239530..1b7ad4c 100644
--- a/compiler/typecheck/TcTyClsDecls.lhs
+++ b/compiler/typecheck/TcTyClsDecls.lhs
@@ -2074,7 +2074,7 @@ classFunDepsErr cls
 noClassTyVarErr :: Class -> SDoc -> SDoc
 noClassTyVarErr clas what
   = sep [ptext (sLit "The") <+> what,
-         ptext (sLit "mentions none of the type variables of the class") <+>
+         ptext (sLit "mentions none of the type or kind variables of the class") <+>
                 quotes (ppr clas <+> hsep (map ppr (classTyVars clas)))]
 
 recSynErr :: [LTyClDecl Name] -> TcRn ()
diff --git a/testsuite/tests/indexed-types/should_fail/T2888.stderr b/testsuite/tests/indexed-types/should_fail/T2888.stderr
index df217dd..3d2c221 100644
--- a/testsuite/tests/indexed-types/should_fail/T2888.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2888.stderr
@@ -1,5 +1,5 @@
 
 T2888.hs:6:1:
     The associated type ‘D’
-    mentions none of the type variables of the class ‘C w’
+    mentions none of the type or kind variables of the class ‘C w’
     In the class declaration for ‘C’
diff --git a/testsuite/tests/indexed-types/should_fail/T9167.stderr b/testsuite/tests/indexed-types/should_fail/T9167.stderr
index ec230fa..1bd21ae 100644
--- a/testsuite/tests/indexed-types/should_fail/T9167.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T9167.stderr
@@ -1,5 +1,5 @@
 
 T9167.hs:5:1:
     The associated type ‘F’
-    mentions none of the type variables of the class ‘C a’
+    mentions none of the type or kind variables of the class ‘C a’
     In the class declaration for ‘C’
diff --git a/testsuite/tests/typecheck/should_fail/tcfail116.stderr b/testsuite/tests/typecheck/should_fail/tcfail116.stderr
index 51b89ef..0136173 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail116.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail116.stderr
@@ -1,6 +1,6 @@
 
 tcfail116.hs:5:1:
     The class method ‘bug’
-    mentions none of the type variables of the class ‘Foo a’
+    mentions none of the type or kind variables of the class ‘Foo a’
     When checking the class method: bug :: ()
     In the class declaration for ‘Foo’