aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-12-15 15:17:59 -0500
committerBen Gamari <ben@smart-cactus.org>2020-12-15 15:17:59 -0500
commit4c6b8d4bb722b6e51406aa0afc334cc437461424 (patch)
treec158fbf692f4e7a50cc286a494068d9ebb428b5c
parent4ffb30d8b637ccebecc81ce610f0af451ac8088d (diff)
Revert "Update for boxed rep"
This reverts commit 4ffb30d8b637ccebecc81ce610f0af451ac8088d.
-rw-r--r--haddock-api/src/Haddock/Convert.hs7
-rw-r--r--haddock-api/src/Haddock/GhcUtils.hs4
2 files changed, 5 insertions, 6 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index f01a54bf..b59602b6 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -45,7 +45,7 @@ import GHC.Builtin.Types.Prim ( alphaTyVars )
import GHC.Builtin.Types ( eqTyConName, listTyConName, liftedTypeKindTyConName
, unitTy, promotedNilDataCon, promotedConsDataCon )
import GHC.Builtin.Names ( hasKey, eqTyConKey, ipClassKey, tYPETyConKey
- , liftedDataConKey, boxedRepDataConKey )
+ , liftedRepDataConKey )
import GHC.Types.Unique ( getUnique )
import GHC.Utils.Misc ( chkAppend, debugIsOn, dropList, equalLength
, filterByList, filterOut )
@@ -568,9 +568,8 @@ synifyType _ vs (TyConApp tc tys)
res_ty
-- Use */# instead of TYPE 'Lifted/TYPE 'Unlifted (#473)
| tc `hasKey` tYPETyConKey
- , [TyConApp rep [TyConApp lev []]] <- tys
- , rep `hasKey` boxedRepDataConKey
- , lev `hasKey` liftedDataConKey
+ , [TyConApp lev []] <- tys
+ , lev `hasKey` liftedRepDataConKey
= noLoc (HsTyVar noExtField NotPromoted (noLoc liftedTypeKindTyConName))
-- Use non-prefix tuple syntax where possible, because it looks nicer.
| Just sort <- tyConTuple_maybe tc
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs
index 1f63b2a7..42dc7f4f 100644
--- a/haddock-api/src/Haddock/GhcUtils.hs
+++ b/haddock-api/src/Haddock/GhcUtils.hs
@@ -43,8 +43,8 @@ import GHC.Types.Var.Set ( VarSet, emptyVarSet )
import GHC.Types.Var.Env ( TyVarEnv, extendVarEnv, elemVarEnv, emptyVarEnv )
import GHC.Core.TyCo.Rep ( Type(..) )
import GHC.Core.Type ( isRuntimeRepVar )
+import GHC.Builtin.Types( liftedRepDataConTyCon )
import GHC.Parser.Annotation (IsUnicodeSyntax(..))
-import GHC.Builtin.Types( liftedRepTy )
import GHC.Data.StringBuffer ( StringBuffer )
import qualified GHC.Data.StringBuffer as S
@@ -656,7 +656,7 @@ defaultRuntimeRepVars = go emptyVarEnv
go subs (TyVarTy tv)
| tv `elemVarEnv` subs
- = liftedRepTy
+ = TyConApp liftedRepDataConTyCon []
| otherwise
= TyVarTy (updateTyVarKind (go subs) tv)