Wibble to sub-kinding

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) }

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