diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2018-11-15 13:48:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 13:48:13 -0800 |
| commit | 0b379984f7898ab0656f71f05fb0163a6a2ddb2c (patch) | |
| tree | c3cb0470898f44d66797f1ce3868d56d4aa639bb /haddock-api/src/Haddock/Convert.hs | |
| parent | 88c17946c9dfba6736e56660f566d21bebefa7c9 (diff) | |
| parent | 936229572252c8c8545c89fcefd267e89005b8b0 (diff) | |
Merge pull request #970 from alpmestan/alp/fix-promotionflag
Follow GHC HEAD's HsTypes.Promoted -> BasicTypes.PromotionFlag change
Diffstat (limited to 'haddock-api/src/Haddock/Convert.hs')
| -rw-r--r-- | haddock-api/src/Haddock/Convert.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs index 823e288e..5ddc9eef 100644 --- a/haddock-api/src/Haddock/Convert.hs +++ b/haddock-api/src/Haddock/Convert.hs @@ -17,7 +17,8 @@ module Haddock.Convert where -- instance heads, which aren't TyThings, so just export everything. import Bag ( emptyBag ) -import BasicTypes ( TupleSort(..), SourceText(..), LexicalFixity(..) ) +import BasicTypes ( TupleSort(..), SourceText(..), LexicalFixity(..) + , PromotionFlag(..) ) import Class import CoAxiom import ConLike @@ -468,13 +469,13 @@ synifyType _ (TyConApp tc tys) | getName tc == listTyConName, [ty] <- vis_tys = noLoc $ HsListTy noExt (synifyType WithinType ty) | tc == promotedNilDataCon, [] <- vis_tys - = noLoc $ HsExplicitListTy noExt Promoted [] + = noLoc $ HsExplicitListTy noExt IsPromoted [] | tc == promotedConsDataCon , [ty1, ty2] <- vis_tys = let hTy = synifyType WithinType ty1 in case synifyType WithinType ty2 of - tTy | L _ (HsExplicitListTy _ Promoted tTy') <- stripKindSig tTy - -> noLoc $ HsExplicitListTy noExt Promoted (hTy : tTy') + tTy | L _ (HsExplicitListTy _ IsPromoted tTy') <- stripKindSig tTy + -> noLoc $ HsExplicitListTy noExt IsPromoted (hTy : tTy') | otherwise -> noLoc $ HsOpTy noExt hTy (noLoc $ getName tc) tTy -- ditto for implicit parameter tycons |