diff options
| author | Gabor Greif <ggreif@gmail.com> | 2019-01-22 11:13:28 (GMT) |
|---|---|---|
| committer | Ben Gamari <ben@well-typed.com> | 2019-01-23 19:07:28 (GMT) |
| commit | b397e979768cce0acdb3597db50527566ac7b42d (patch) | |
| tree | fb5fff94075fdc2254853e24cf11352394fba79c | |
| parent | bb2acfe0ec4c196a87218709ee28327845d62dc4 (diff) | |
| download | ghc-b397e979768cce0acdb3597db50527566ac7b42d.zip ghc-b397e979768cce0acdb3597db50527566ac7b42d.tar.gz ghc-b397e979768cce0acdb3597db50527566ac7b42d.tar.bz2 | |
Minor refactor [ci skip]
| -rw-r--r-- | compiler/basicTypes/MkId.hs | 2 | ||||
| -rw-r--r-- | compiler/prelude/TysPrim.hs | 8 | ||||
| -rw-r--r-- | compiler/prelude/TysWiredIn.hs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs index 3e70fdb..38af092 100644 --- a/compiler/basicTypes/MkId.hs +++ b/compiler/basicTypes/MkId.hs @@ -1265,7 +1265,7 @@ proxyHashId `setNeverLevPoly` ty ) where -- proxy# :: forall k (a:k). Proxy# k a - bndrs = mkTemplateKiTyVars [liftedTypeKind] (\ks -> ks) + bndrs = mkTemplateKiTyVars [liftedTypeKind] id [k,t] = mkTyVarTys bndrs ty = mkSpecForAllTys bndrs (mkProxyPrimTy k t) diff --git a/compiler/prelude/TysPrim.hs b/compiler/prelude/TysPrim.hs index 77ea80e..2a604cc 100644 --- a/compiler/prelude/TysPrim.hs +++ b/compiler/prelude/TysPrim.hs @@ -858,7 +858,7 @@ proxyPrimTyCon :: TyCon proxyPrimTyCon = mkPrimTyCon proxyPrimTyConName binders res_kind [Nominal,Nominal] where -- Kind: forall k. k -> Void# - binders = mkTemplateTyConBinders [liftedTypeKind] (\ks-> ks) + binders = mkTemplateTyConBinders [liftedTypeKind] id res_kind = unboxedTupleKind [] @@ -874,7 +874,7 @@ eqPrimTyCon :: TyCon -- The representation type for equality predicates eqPrimTyCon = mkPrimTyCon eqPrimTyConName binders res_kind roles where -- Kind :: forall k1 k2. k1 -> k2 -> Void# - binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] (\ks -> ks) + binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] id res_kind = unboxedTupleKind [] roles = [Nominal, Nominal, Nominal, Nominal] @@ -885,7 +885,7 @@ eqReprPrimTyCon :: TyCon -- See Note [The equality types story] eqReprPrimTyCon = mkPrimTyCon eqReprPrimTyConName binders res_kind roles where -- Kind :: forall k1 k2. k1 -> k2 -> Void# - binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] (\ks -> ks) + binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] id res_kind = unboxedTupleKind [] roles = [Nominal, Nominal, Representational, Representational] @@ -896,7 +896,7 @@ eqPhantPrimTyCon :: TyCon eqPhantPrimTyCon = mkPrimTyCon eqPhantPrimTyConName binders res_kind roles where -- Kind :: forall k1 k2. k1 -> k2 -> Void# - binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] (\ks -> ks) + binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] id res_kind = unboxedTupleKind [] roles = [Nominal, Nominal, Phantom, Phantom] diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs index a0a043d..6fea0e4 100644 --- a/compiler/prelude/TysWiredIn.hs +++ b/compiler/prelude/TysWiredIn.hs @@ -1074,7 +1074,7 @@ eqSCSelId, heqSCSelId, coercibleSCSelId :: Id datacon = pcDataCon heqDataConName tvs [sc_pred] tycon -- Kind: forall k1 k2. k1 -> k2 -> Constraint - binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] (\ks -> ks) + binders = mkTemplateTyConBinders [liftedTypeKind, liftedTypeKind] id roles = [Nominal, Nominal, Nominal, Nominal] rhs = mkDataTyConRhs [datacon] |