From 631d9e181da713eee9c18a7f3bbf535dee53d925 Mon Sep 17 00:00:00 2001 From: Sergey Vinokurov Date: Fri, 30 Mar 2018 10:52:44 +0100 Subject: [PATCH] Replace 'fmap f $' with 'f <$>' --- src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs | 2 +- .../Haskell/Brittany/Internal/Layouters/Pattern.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs index 7f0d8e9..a7848eb 100644 --- a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs @@ -659,7 +659,7 @@ layoutExpr lexpr@(L _ expr) = do $ List.last stmtDocs , appSep $ docLit $ Text.pack "|" , docSeq $ List.intersperse docCommaSep - $ fmap docForceSingleline $ List.init stmtDocs + $ docForceSingleline <$> List.init stmtDocs , docLit $ Text.pack " ]" ] addAlternative $ diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs index d506239..120c2b6 100644 --- a/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs @@ -95,7 +95,7 @@ layoutPat lpat@(L _ pat) = docWrapNode lpat $ case pat of then return Nothing else Just <$> docSharedWrapper layoutPat fPat return (lrdrNameToText lnameF, fExpDoc) - fmap Seq.singleton $ docSeq + Seq.singleton <$> docSeq [ appSep $ docLit t , appSep $ docLit $ Text.pack "{" , docSeq $ List.intersperse docCommaSep @@ -112,7 +112,7 @@ layoutPat lpat@(L _ pat) = docWrapNode lpat $ case pat of ConPatIn lname (RecCon (HsRecFields [] (Just 0))) -> do -- Abc { .. } -> expr let t = lrdrNameToText lname - fmap Seq.singleton $ docSeq + Seq.singleton <$> docSeq [ appSep $ docLit t , docLit $ Text.pack "{..}" ] @@ -124,7 +124,7 @@ layoutPat lpat@(L _ pat) = docWrapNode lpat $ case pat of then return Nothing else Just <$> docSharedWrapper layoutPat fPat return (lrdrNameToText lnameF, fExpDoc) - fmap Seq.singleton $ docSeq + Seq.singleton <$> docSeq [ appSep $ docLit t , appSep $ docLit $ Text.pack "{" , docSeq $ fds >>= \case @@ -193,7 +193,7 @@ layoutPat lpat@(L _ pat) = docWrapNode lpat $ case pat of -- else -- VarPat n -> return $ stringLayouter lpat $ rdrNameToText n -- endif - _ -> fmap return $ briDocByExactInlineOnly "some unknown pattern" lpat + _ -> return <$> briDocByExactInlineOnly "some unknown pattern" lpat colsWrapPat :: Seq BriDocNumbered -> ToBriDocM BriDocNumbered colsWrapPat = docCols ColPatterns . fmap return . Foldable.toList