[commit: ghc] master: Rename polyKindsErr to dataKindsErr (e3f689f)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e3f689f745e36384c93ce7dff64d3a06360ace97

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

commit e3f689f745e36384c93ce7dff64d3a06360ace97
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Jan 25 13:19:58 2012 +0000

    Rename polyKindsErr to dataKindsErr

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

 compiler/rename/RnEnv.lhs       |    6 +++---
 compiler/rename/RnTypes.lhs     |    4 ++--
 compiler/typecheck/TcHsType.lhs |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 29a5625..7858525 100644
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -39,7 +39,7 @@ module RnEnv (
 	addFvRn, mapFvRn, mapMaybeFvRn, mapFvRnCPS,
 	warnUnusedMatches,
 	warnUnusedTopBinds, warnUnusedLocalBinds,
-	dataTcOccs, unknownNameErr, kindSigErr, polyKindsErr, perhapsForallMsg,
+	dataTcOccs, unknownNameErr, kindSigErr, dataKindsErr, perhapsForallMsg,
 
         HsDocContext(..), docOfHsDocContext
     ) where
@@ -1434,8 +1434,8 @@ kindSigErr thing
   = hang (ptext (sLit "Illegal kind signature for") <+> quotes (ppr thing))
        2 (ptext (sLit "Perhaps you intended to use -XKindSignatures"))
 
-polyKindsErr :: Outputable a => a -> SDoc
-polyKindsErr thing
+dataKindsErr :: Outputable a => a -> SDoc
+dataKindsErr thing
   = hang (ptext (sLit "Illegal kind:") <+> quotes (ppr thing))
        2 (ptext (sLit "Perhaps you intended to use -XDataKinds"))
 
diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index 22d6f22..3b86d0b 100644
--- a/compiler/rename/RnTypes.lhs
+++ b/compiler/rename/RnTypes.lhs
@@ -197,7 +197,7 @@ rnHsTyKi isType doc (HsFunTy ty1 ty2) = do
 
 rnHsTyKi isType doc listTy@(HsListTy ty) = do
     data_kinds <- xoptM Opt_DataKinds
-    unless (data_kinds || isType) (addErr (polyKindsErr listTy))
+    unless (data_kinds || isType) (addErr (dataKindsErr listTy))
     ty' <- rnLHsTyKi isType doc ty
     return (HsListTy ty')
 
@@ -217,7 +217,7 @@ rnHsTyKi isType doc (HsPArrTy ty) = ASSERT ( isType ) do
 -- sometimes crop up as a result of CPR worker-wrappering dictionaries.
 rnHsTyKi isType doc tupleTy@(HsTupleTy tup_con tys) = do
     data_kinds <- xoptM Opt_DataKinds
-    unless (data_kinds || isType) (addErr (polyKindsErr tupleTy))
+    unless (data_kinds || isType) (addErr (dataKindsErr tupleTy))
     tys' <- mapM (rnLHsTyKi isType doc) tys
     return (HsTupleTy tup_con tys')
 
diff --git a/compiler/typecheck/TcHsType.lhs b/compiler/typecheck/TcHsType.lhs
index af46445..b2482c0 100644
--- a/compiler/typecheck/TcHsType.lhs
+++ b/compiler/typecheck/TcHsType.lhs
@@ -46,7 +46,7 @@ import {-# SOURCE #-}	TcSplice( kcSpliceType )
 import HsSyn
 import RnHsSyn
 import TcRnMonad
-import RnEnv   ( polyKindsErr )
+import RnEnv   ( dataKindsErr )
 import TcHsSyn ( mkZonkTcTyVar )
 import TcEvidence( HsWrapper )
 import TcEnv
@@ -1344,7 +1344,7 @@ sc_ds_var_app name arg_kis = do
     Just (AGlobal (ATyCon tc))
       | isAlgTyCon tc || isTupleTyCon tc -> do
       data_kinds <- xoptM Opt_DataKinds
-      unless data_kinds $ addErr (polyKindsErr name)
+      unless data_kinds $ addErr (dataKindsErr name)
       let tc_kind = tyConKind tc
       case isPromotableKind tc_kind of
         Just n | n == length arg_kis ->