[commit: ghc] master: Wibble to sub-kinding (1bc8014)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1bc80144de86ba1972fc693f5046efe46884bb10

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

commit 1bc80144de86ba1972fc693f5046efe46884bb10
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Feb 17 14:00:53 2012 +0000

    Wibble to sub-kinding

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

 compiler/typecheck/TcInteract.lhs |    2 +-
 compiler/typecheck/TcSMonad.lhs   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/typecheck/TcInteract.lhs b/compiler/typecheck/TcInteract.lhs
index 7bb068e..3e58013 100644
--- a/compiler/typecheck/TcInteract.lhs
+++ b/compiler/typecheck/TcInteract.lhs
@@ -534,7 +534,7 @@ trySpontaneousEqTwoWay :: SubGoalDepth
 -- Both tyvars are *touchable* MetaTyvars so there is only a chance for kind error here
 
 trySpontaneousEqTwoWay d eqv gw tv1 tv2
-  = do { let k1_sub_k2 = k1 `isSubKind` k2
+  = do { let k1_sub_k2 = k1 `tcIsSubKind` k2
        ; if k1_sub_k2 && nicer_to_update_tv2
          then solveWithIdentity d eqv gw tv2 (mkTyVarTy tv1)
          else solveWithIdentity d eqv gw tv1 (mkTyVarTy tv2) }
diff --git a/compiler/typecheck/TcSMonad.lhs b/compiler/typecheck/TcSMonad.lhs
index 8125fab..77c81e7 100644
--- a/compiler/typecheck/TcSMonad.lhs
+++ b/compiler/typecheck/TcSMonad.lhs
@@ -142,7 +142,7 @@ import TrieMap
 
 \begin{code}
 compatKind :: Kind -> Kind -> Bool
-compatKind k1 k2 = k1 `isSubKind` k2 || k2 `isSubKind` k1 
+compatKind k1 k2 = k1 `tcIsSubKind` k2 || k2 `tcIsSubKind` k1 
 
 mkKindErrorCtxtTcS :: Type -> Kind 
                    -> Type -> Kind