Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 233cce46 by Alan Zimmerman at 2026-10-31T09:23:01-04:00 EPA: Tidy up ExactPrint.markAnnListA' It takes an action which can modify the AnnList, but this is never used. So remove it. - - - - - 1 changed file: - utils/check-exact/ExactPrint.hs Changes: ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -1486,9 +1486,7 @@ markAnnList ann action = do markAnnList' :: (Monad m, Monoid w) => AnnList -> EP w m a -> EP w m (AnnList, a) markAnnList' ann action = do - markAnnListA' ann $ \a -> do - r <- action - return (a,r) + markAnnListA' ann $ action markAnnListA :: (Monad m, Monoid w) => EpAnn AnnList @@ -1503,14 +1501,14 @@ markAnnListA an action = do markAnnListA' :: (Monad m, Monoid w) => AnnList - -> (AnnList -> EP w m (AnnList, a)) + -> EP w m a -> EP w m (AnnList, a) markAnnListA' an action = do an0 <- markLensBracketsO' an lal_brackets an1 <- markEpAnnAllLT' an0 lal_semis - (an2, r) <- action an1 - an3 <- markLensBracketsC' an2 lal_brackets - return (an3, r) + r <- action + an2 <- markLensBracketsC' an1 lal_brackets + return (an2, r) -- --------------------------------------------------------------------- @@ -2413,9 +2411,7 @@ instance ExactPrint (ClsInstDecl GhcPs) where , cid_modifiers = mods }) = do (mbWarn', i', w', mbOverlap', inst_ty', mods') <- top_matter - (ann_list', decls') <- markAnnListA' ann_list $ \a -> do - r <- setLayoutBoth $ mapM markAnnotated decls - return (a,r) + (ann_list', decls') <- markAnnListA' ann_list $ setLayoutBoth $ mapM markAnnotated decls return (ClsInstDecl { cid_ext = (mbWarn', AnnClsInstDecl i' w' ann_list') , cid_poly_ty = inst_ty' , cid_decls = decls' @@ -3336,9 +3332,7 @@ markMaybeDodgyStmts (an,l) stmts = c' <- markEpToken c return (Left (o',c'), r) Right an' -> do - (an'',r') <- markAnnListA' an' $ \a -> do - r <- markAnnotatedWithLayout stmts - return (a, r) + (an'',r') <- markAnnListA' an' $ markAnnotatedWithLayout stmts return (Right an'',r') return ((an0, l), stmts') else return ((an, l), stmts) @@ -3411,9 +3405,7 @@ instance (Typeable body, = MG (origin,an) (L (setAnchorEpa l anc ts cs) matches) exact (MG (origin,an) (L l matches)) = do - (an0,matches') <- markAnnListA' an $ \a -> do - m' <- markAnnotated matches - return (a,m') + (an0,matches') <- markAnnListA' an $ markAnnotated matches return (MG (origin, an0) (L l matches')) -- --------------------------------------------------------------------- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/233cce4652a8100c6701b946955430bc... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/233cce4652a8100c6701b946955430bc... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help