diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-03-31 11:34:17 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-03-31 11:34:17 -0400 |
| commit | c623c7d2df417caac4b72b747ef5262d86ee776a (patch) | |
| tree | 3408bccdb48bb9f9264cd4974ac09911cf30a518 /haddock-api | |
| parent | 9809d1bd36812f757f71c13015d3186226e28f23 (diff) | |
| parent | d8d8024ad6796549a8d3b5512dabf3288d14e30f (diff) | |
Merge commit 'd8d8024ad6796549a8d3b5512dabf3288d14e30f' into ghc-head
Diffstat (limited to 'haddock-api')
| -rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 6 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Types.hs | 47 |
2 files changed, 25 insertions, 28 deletions
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index b8db6dfd..2fc42131 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -338,7 +338,7 @@ reparenTypePrec = go where -- Shorter name for 'reparenType' - go :: XParTy a ~ ApiAnn' AnnParen => Precedence -> HsType a -> HsType a + go :: XParTy a ~ EpAnn' AnnParen => Precedence -> HsType a -> HsType a go _ (HsBangTy x b ty) = HsBangTy x b (reparenLType ty) go _ (HsTupleTy x con tys) = HsTupleTy x con (map reparenLType tys) go _ (HsSumTy x tys) = HsSumTy x (map reparenLType tys) @@ -378,11 +378,11 @@ reparenTypePrec = go go _ t@XHsType{} = t -- Located variant of 'go' - goL :: XParTy a ~ ApiAnn' AnnParen => Precedence -> LHsType a -> LHsType a + goL :: XParTy a ~ EpAnn' AnnParen => Precedence -> LHsType a -> LHsType a goL ctxt_prec = mapXRec @a (go ctxt_prec) -- Optionally wrap a type in parens - paren :: XParTy a ~ ApiAnn' AnnParen + paren :: XParTy a ~ EpAnn' AnnParen => Precedence -- Precedence of context -> Precedence -- Precedence of top-level operator -> HsType a -> HsType a -- Wrap in parens if (ctxt >= op) diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs index 5c6f09a3..d9943e55 100644 --- a/haddock-api/src/Haddock/Types.hs +++ b/haddock-api/src/Haddock/Types.hs @@ -727,38 +727,35 @@ type instance Anno (HsOuterTyVarBndrs Specificity DocNameI) = SrcSpanAnnA type instance Anno (HsSigType DocNameI) = SrcSpanAnnA type XRecCond a - = ( XParTy a ~ ApiAnn' AnnParen - -- , XParTy (NoGhcTc a) ~ ApiAnn' AnnParen - -- , NoGhcTcPass (NoGhcTcPass a) ~ NoGhcTcPass a - -- , IsPass a + = ( XParTy a ~ EpAnn' AnnParen , NoGhcTc a ~ a , MapXRec a , UnXRec a , WrapXRec a (HsType a) ) -type instance XForAllTy DocNameI = ApiAnn -type instance XQualTy DocNameI = ApiAnn -type instance XTyVar DocNameI = ApiAnn -type instance XStarTy DocNameI = ApiAnn -type instance XAppTy DocNameI = ApiAnn -type instance XAppKindTy DocNameI = ApiAnn -type instance XFunTy DocNameI = ApiAnn -type instance XListTy DocNameI = ApiAnn' AnnParen -type instance XTupleTy DocNameI = ApiAnn' AnnParen -type instance XSumTy DocNameI = ApiAnn' AnnParen -type instance XOpTy DocNameI = ApiAnn -type instance XParTy DocNameI = ApiAnn' AnnParen -type instance XIParamTy DocNameI = ApiAnn -type instance XKindSig DocNameI = ApiAnn +type instance XForAllTy DocNameI = EpAnn +type instance XQualTy DocNameI = EpAnn +type instance XTyVar DocNameI = EpAnn +type instance XStarTy DocNameI = EpAnn +type instance XAppTy DocNameI = EpAnn +type instance XAppKindTy DocNameI = EpAnn +type instance XFunTy DocNameI = EpAnn +type instance XListTy DocNameI = EpAnn' AnnParen +type instance XTupleTy DocNameI = EpAnn' AnnParen +type instance XSumTy DocNameI = EpAnn' AnnParen +type instance XOpTy DocNameI = EpAnn +type instance XParTy DocNameI = EpAnn' AnnParen +type instance XIParamTy DocNameI = EpAnn +type instance XKindSig DocNameI = EpAnn type instance XSpliceTy DocNameI = Void -- see `renameHsSpliceTy` -type instance XDocTy DocNameI = ApiAnn -type instance XBangTy DocNameI = ApiAnn -type instance XRecTy DocNameI = ApiAnn -type instance XExplicitListTy DocNameI = ApiAnn -type instance XExplicitTupleTy DocNameI = ApiAnn -type instance XTyLit DocNameI = ApiAnn -type instance XWildCardTy DocNameI = ApiAnn +type instance XDocTy DocNameI = EpAnn +type instance XBangTy DocNameI = EpAnn +type instance XRecTy DocNameI = EpAnn +type instance XExplicitListTy DocNameI = EpAnn +type instance XExplicitTupleTy DocNameI = EpAnn +type instance XTyLit DocNameI = EpAnn +type instance XWildCardTy DocNameI = EpAnn type instance XXType DocNameI = HsCoreTy type instance XHsForAllVis DocNameI = NoExtField |