summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorVladislav Zavialov <vlad.z.4096@gmail.com>2022-12-04 21:50:40 +0300
committerMarge Bot <ben+marge-bot@smart-cactus.org>2023-01-05 23:01:55 -0500
commit9e077999eb3d09af6f31eb92233d4d757ece75f8 (patch)
tree295211c6306683eb4c41455bf9900f8fc3038267 /utils
parent22bb89989fc0a907ef6b8f6ae99aa8907f67e438 (diff)
downloadhaskell-9e077999eb3d09af6f31eb92233d4d757ece75f8.tar.gz
HsToken in TypeArg (#19623)
Updates the haddock submodule.
Diffstat (limited to 'utils')
-rw-r--r--utils/check-exact/ExactPrint.hs14
m---------utils/haddock0
2 files changed, 7 insertions, 7 deletions
diff --git a/utils/check-exact/ExactPrint.hs b/utils/check-exact/ExactPrint.hs
index c3d10b1f56..30a3234ee0 100644
--- a/utils/check-exact/ExactPrint.hs
+++ b/utils/check-exact/ExactPrint.hs
@@ -1998,12 +1998,12 @@ exactHsFamInstLHS an thing bndrs typats fixity mb_ctxt = do
-- ---------------------------------------------------------------------
instance (ExactPrint tm, ExactPrint ty, Outputable tm, Outputable ty)
- => ExactPrint (HsArg tm ty) where
+ => ExactPrint (HsArg GhcPs tm ty) where
getAnnotationEntry = const NoEntryVal
setAnnotationAnchor a _ _ = a
exact a@(HsValArg tm) = markAnnotated tm >> return a
- exact a@(HsTypeArg ss ty) = printStringAtSs ss "@" >> markAnnotated ty >> return a
+ exact a@(HsTypeArg at ty) = markToken at >> markAnnotated ty >> return a
exact x@(HsArgPar _sp) = withPpr x -- Does not appear in original source
-- ---------------------------------------------------------------------
@@ -3777,7 +3777,7 @@ instance ExactPrint (HsType GhcPs) where
getAnnotationEntry (HsQualTy _ _ _) = NoEntryVal
getAnnotationEntry (HsTyVar an _ _) = fromAnn an
getAnnotationEntry (HsAppTy _ _ _) = NoEntryVal
- getAnnotationEntry (HsAppKindTy _ _ _) = NoEntryVal
+ getAnnotationEntry (HsAppKindTy _ _ _ _) = NoEntryVal
getAnnotationEntry (HsFunTy an _ _ _) = fromAnn an
getAnnotationEntry (HsListTy an _) = fromAnn an
getAnnotationEntry (HsTupleTy an _ _) = fromAnn an
@@ -3801,7 +3801,7 @@ instance ExactPrint (HsType GhcPs) where
setAnnotationAnchor a@(HsQualTy _ _ _) _ _s = a
setAnnotationAnchor (HsTyVar an a b) anc cs = (HsTyVar (setAnchorEpa an anc cs) a b)
setAnnotationAnchor a@(HsAppTy _ _ _) _ _s = a
- setAnnotationAnchor a@(HsAppKindTy _ _ _) _ _s = a
+ setAnnotationAnchor a@(HsAppKindTy _ _ _ _) _ _s = a
setAnnotationAnchor (HsFunTy an a b c) anc cs = (HsFunTy (setAnchorEpa an anc cs) a b c)
setAnnotationAnchor (HsListTy an a) anc cs = (HsListTy (setAnchorEpa an anc cs) a)
setAnnotationAnchor (HsTupleTy an a b) anc cs = (HsTupleTy (setAnchorEpa an anc cs) a b)
@@ -3842,11 +3842,11 @@ instance ExactPrint (HsType GhcPs) where
t1' <- markAnnotated t1
t2' <- markAnnotated t2
return (HsAppTy an t1' t2')
- exact (HsAppKindTy ss ty ki) = do
+ exact (HsAppKindTy ss ty at ki) = do
ty' <- markAnnotated ty
- printStringAtSs ss "@"
+ at' <- markToken at
ki' <- markAnnotated ki
- return (HsAppKindTy ss ty' ki')
+ return (HsAppKindTy ss ty' at' ki')
exact (HsFunTy an mult ty1 ty2) = do
ty1' <- markAnnotated ty1
mult' <- markArrow mult
diff --git a/utils/haddock b/utils/haddock
-Subproject 261a7c8ac5b5ff29e6e0380690cbb6ee9730f98
+Subproject 519a95998b09a2c9c7a42c3a0cf2ca0c4358bb4