diff options
| author | Richard Eisenberg <rae@cs.brynmawr.edu> | 2017-01-19 08:41:41 -0500 |
|---|---|---|
| committer | Richard Eisenberg <rae@cs.brynmawr.edu> | 2017-01-19 08:41:41 -0500 |
| commit | 4349092ef61ca7da7c7cbcd9aa7dcbb97fe59bdf (patch) | |
| tree | 8b45c618e544c6038441ac58abb9a7313b973f7d /haddock-api/src/Haddock/Convert.hs | |
| parent | b19ea3ababeb231157c4a067c43003e09b1f0185 (diff) | |
Upstream changes re levity polymorphism
Diffstat (limited to 'haddock-api/src/Haddock/Convert.hs')
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 87a273b2..b5966291 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -34,10 +34,10 @@ import TcType ( tcSplitSigmaTy ) import TyCon import Type import TyCoRep -import TysPrim ( alphaTyVars, unliftedTypeKindTyConName ) +import TysPrim ( alphaTyVars ) import TysWiredIn ( listTyConName, starKindTyConName, unitTy ) import PrelNames ( hasKey, eqTyConKey, ipClassKey - , tYPETyConKey, ptrRepLiftedDataConKey, ptrRepUnliftedDataConKey ) + , tYPETyConKey, liftedRepDataConKey ) import Unique ( getUnique ) import Util ( filterByList, filterOut ) import Var @@ -378,12 +378,8 @@ synifyType _ (TyConApp tc tys) -- Use */# instead of TYPE 'Lifted/TYPE 'Unlifted (#473) | tc `hasKey` tYPETyConKey , [TyConApp lev []] <- tys - , lev `hasKey` ptrRepLiftedDataConKey + , lev `hasKey` liftedRepDataConKey = noLoc (HsTyVar NotPromoted (noLoc starKindTyConName)) - | tc `hasKey` tYPETyConKey - , [TyConApp lev []] <- tys - , lev `hasKey` ptrRepUnliftedDataConKey - = noLoc (HsTyVar NotPromoted (noLoc unliftedTypeKindTyConName)) -- Use non-prefix tuple syntax where possible, because it looks nicer. | Just sort <- tyConTuple_maybe tc , tyConArity tc == length tys |