X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypes%2FType.lhs;h=f4681e40f16c18c60f277a1ebf59eae6483bbec6;hb=335bc125303a226a78b20be8a7b8fec5b6c59d2b;hp=deaef17646ed15185a40911c5a338ae8e8dbf3ef;hpb=ab22f4e6456820c1b5169d75f5975a94e61f54ce;p=ghc-hetmet.git diff --git a/compiler/types/Type.lhs b/compiler/types/Type.lhs index deaef17..f4681e4 100644 --- a/compiler/types/Type.lhs +++ b/compiler/types/Type.lhs @@ -110,7 +110,6 @@ import Var import VarEnv import VarSet -import OccName import Name import Class import PrelNames @@ -1289,7 +1288,7 @@ substTyVarBndr subst@(TvSubst in_scope env) old_var | is_co_var = setTyVarKind old_var (substTy subst kind) | otherwise = old_var kind = tyVarKind old_var - is_co_var = isCoercionKind kind + is_co_var = isCoVar old_var \end{code} ---------------------------------------------------- @@ -1465,14 +1464,6 @@ defaultKind k | isSubArgTypeKind k = liftedTypeKind | otherwise = k -isCoercionKind :: Kind -> Bool --- All coercions are of form (ty1 :=: ty2) --- This function is here rather than in Coercion, --- because it's used by substTy -isCoercionKind k | Just k' <- kindView k = isCoercionKind k' -isCoercionKind (PredTy (EqPred {})) = True -isCoercionKind other = False - isEqPred :: PredType -> Bool isEqPred (EqPred _ _) = True isEqPred other = False