diff options
Diffstat (limited to 'compiler/typecheck/TcValidity.hs')
| -rw-r--r-- | compiler/typecheck/TcValidity.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/typecheck/TcValidity.hs b/compiler/typecheck/TcValidity.hs index df54dc2a94..dab9f2c308 100644 --- a/compiler/typecheck/TcValidity.hs +++ b/compiler/typecheck/TcValidity.hs @@ -50,7 +50,7 @@ import Name import VarEnv import VarSet import Id ( idType, idName ) -import Var ( TyVarBndr(..), mkTyVar ) +import Var ( VarBndr(..), mkTyVar ) import ErrUtils import DynFlags import Util @@ -481,11 +481,11 @@ check_type env ctxt rank ty (forAllEscapeErr env' ty tau_kind) } where - (tvbs, phi) = tcSplitForAllTyVarBndrs ty + (tvbs, phi) = tcSplitForAllVarBndrs ty (theta, tau) = tcSplitPhiTy phi tvs = binderVars tvbs - (env', _) = tidyTyCoVarBndrs env tvs + (env', _) = tidyVarBndrs env tvs tau_kind = typeKind tau phi_kind | null theta = tau_kind @@ -2079,7 +2079,7 @@ checkValidTelescope :: [TyConBinder] -- explicit vars (zonked) checkValidTelescope tvbs user_tyvars extra = do { let tvs = binderVars tvbs - (_, sorted_tidied_tvs) = tidyTyCoVarBndrs emptyTidyEnv $ + (_, sorted_tidied_tvs) = tidyVarBndrs emptyTidyEnv $ toposortTyVars tvs ; unless (go [] emptyVarSet (binderVars tvbs)) $ addErr $ @@ -2118,7 +2118,7 @@ fvType (TyConApp _ tys) = fvTypes tys fvType (LitTy {}) = [] fvType (AppTy fun arg) = fvType fun ++ fvType arg fvType (FunTy arg res) = fvType arg ++ fvType res -fvType (ForAllTy (TvBndr tv _) ty) +fvType (ForAllTy (Bndr tv _) ty) = fvType (tyVarKind tv) ++ filter (/= tv) (fvType ty) fvType (CastTy ty _) = fvType ty |