summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2019-01-22 12:13:28 +0100
committerBen Gamari <ben@smart-cactus.org>2019-02-20 14:28:54 -0500
commit327a48ba0d3c205a8421a73696d19c6cd93364b5 (patch)
tree6f7ff8e665910e4660a153950b56d1bfd3c19464
parent9c09935adf5958564e51f6cef9a8e972e34add87 (diff)
downloadhaskell-327a48ba0d3c205a8421a73696d19c6cd93364b5.tar.gz
Minor refactor [ci skip]
-rw-r--r--compiler/basicTypes/MkId.hs2
-rw-r--r--compiler/prelude/TysPrim.hs8
-rw-r--r--compiler/prelude/TysWiredIn.hs2
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index 3e70fdb592..38af09234b 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 77ea80eb0b..2a604ccc88 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 a0a043dfa9..6fea0e4f05 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]