From e13239386f6e5e3a70cc188f0169596310dfa2f8 Mon Sep 17 00:00:00 2001 From: Stephen Morgan Date: Mon, 16 Aug 2021 14:09:17 +1000 Subject: [PATCH] cln: hlint: Clean up == and elem related hlint warnings. --- .hlint.yaml | 3 --- Shake.hs | 2 +- bin/hledger-smooth.hs | 2 +- hledger-lib/Hledger/Data/Journal.hs | 2 +- hledger-lib/Hledger/Data/Valuation.hs | 2 +- hledger-lib/Hledger/Utils/Debug.hs | 4 ++-- hledger-ui/Hledger/UI/AccountsScreen.hs | 2 +- hledger-ui/Hledger/UI/RegisterScreen.hs | 2 +- hledger-ui/Hledger/UI/TransactionScreen.hs | 2 +- hledger-ui/Hledger/UI/UIOptions.hs | 4 ++-- hledger-web/Hledger/Web/Foundation.hs | 5 +---- hledger/Hledger/Cli/Main.hs | 2 +- 12 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.hlint.yaml b/.hlint.yaml index 410de31d6..5225cefff 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -11,7 +11,6 @@ - ignore: {name: "Use list literal"} - ignore: {name: "Move brackets to avoid $"} - ignore: {name: "Redundant $"} -- ignore: {name: "Use notElem"} - ignore: {name: "Use <$>"} - ignore: {name: "Redundant bracket"} - ignore: {name: "Avoid reverse"} @@ -19,7 +18,6 @@ - ignore: {name: "Use $>"} - ignore: {name: "Use unless"} - ignore: {name: "Use any"} -- ignore: {name: "Use /="} - ignore: {name: "Use =<<"} - ignore: {name: "Use fmap"} - ignore: {name: "Use <&>"} @@ -43,7 +41,6 @@ - ignore: {name: "Use replicate"} - ignore: {name: "Use void"} - ignore: {name: "Use elemIndex"} -- ignore: {name: "Use =="} - ignore: {name: "Use lambda-case"} - ignore: {name: "Replace case with fromMaybe"} diff --git a/Shake.hs b/Shake.hs index a7c453022..1f5951e4b 100755 --- a/Shake.hs +++ b/Shake.hs @@ -681,7 +681,7 @@ main = do maybePrependPackage s = maybe s (++("-"++s)) mpkg toTag = maybePrependPackage isOldRelease rev = isReleaseVersion rev && toTag rev `elem` tags - isNewRelease rev = isReleaseVersion rev && not (toTag rev `elem` tags) + isNewRelease rev = isReleaseVersion rev && toTag rev `notElem` tags -- git revision corresponding to the changelog version: -- a hash (a3f19c15), package release tag (hledger-ui-1.20), or project release tag (1.20) lastrev diff --git a/bin/hledger-smooth.hs b/bin/hledger-smooth.hs index 33679b4e3..90658eacc 100755 --- a/bin/hledger-smooth.hs +++ b/bin/hledger-smooth.hs @@ -130,7 +130,7 @@ postingSetDate md p@Posting{ptags,pcomment} = p{pdate=md, ptags=ptags'', pcommen Nothing -> ptags' Just d -> ptags'++[("date", T.pack $ show d)] where - ptags' = filter (not.(=="date").fst) ptags + ptags' = filter ((/="date").fst) ptags pcomment' = case md of Nothing -> pcomment diff --git a/hledger-lib/Hledger/Data/Journal.hs b/hledger-lib/Hledger/Data/Journal.hs index 0fab04a69..3e2e6c18e 100644 --- a/hledger-lib/Hledger/Data/Journal.hs +++ b/hledger-lib/Hledger/Data/Journal.hs @@ -409,7 +409,7 @@ journalAccountTypeQuery atypes fallbackregex Journal{jdeclaredaccounttypes} = differentlytypedsubs = concat [subs | (t,bs) <- M.toList jdeclaredaccounttypes - , not $ t `elem` atypes + , t `notElem` atypes , let subs = [b | b <- bs, any (`isAccountNamePrefixOf` b) as] ] diff --git a/hledger-lib/Hledger/Data/Valuation.hs b/hledger-lib/Hledger/Data/Valuation.hs index d256a3b4e..b56fdfc38 100644 --- a/hledger-lib/Hledger/Data/Valuation.hs +++ b/hledger-lib/Hledger/Data/Valuation.hs @@ -342,7 +342,7 @@ pricesShortestPath start end edges = | e <- nextedges , let path' = dbgpath "trying" $ path ++ [e] -- PERF prepend ? , let pathnodes' = mpto e : pathnodes - , let remainingedges' = [r | r <- remainingedges, not $ mpto r `elem` pathnodes' ] + , let remainingedges' = [r | r <- remainingedges, mpto r `notElem` pathnodes' ] ] -- debug helpers diff --git a/hledger-lib/Hledger/Utils/Debug.hs b/hledger-lib/Hledger/Utils/Debug.hs index db40188c4..d7bcaeea2 100644 --- a/hledger-lib/Hledger/Utils/Debug.hs +++ b/hledger-lib/Hledger/Utils/Debug.hs @@ -202,7 +202,7 @@ useColorOnHandle h = unsafePerformIO $ do let coloroption = colorOption return $ and [ not no_color - ,not $ coloroption `elem` ["never","no"] + ,coloroption `notElem` ["never","no"] ,coloroption `elem` ["always","yes"] || supports_color ] @@ -240,7 +240,7 @@ colorOption = -- {-# OPTIONS_GHC -fno-cse #-} -- {-# NOINLINE hasOutputFile #-} hasOutputFile :: Bool -hasOutputFile = not $ outputFileOption `elem` [Nothing, Just "-"] +hasOutputFile = outputFileOption `notElem` [Nothing, Just "-"] -- Keep synced with output-file flag definition in hledger:CliOptions. -- Avoid using dbg*, pshow etc. in this function (infinite loop). diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index a0173f07c..56443da57 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -265,7 +265,7 @@ asHandle ui0@UIState{ VtyEvent (EvKey (KChar 'q') []) -> halt ui -- EvKey (KChar 'l') [MCtrl] -> do VtyEvent (EvKey KEsc []) -> continue $ resetScreens d ui - VtyEvent (EvKey (KChar c) []) | c `elem` ['?'] -> continue $ setMode Help ui + VtyEvent (EvKey (KChar c) []) | c == '?' -> continue $ setMode Help ui -- XXX AppEvents currently handled only in Normal mode -- XXX be sure we don't leave unconsumed events piling up AppEvent (DateChange old _) | isStandardPeriod p && p `periodContainsDate` old -> diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs index 4a0910d45..531ab12e9 100644 --- a/hledger-ui/Hledger/UI/RegisterScreen.hs +++ b/hledger-ui/Hledger/UI/RegisterScreen.hs @@ -310,7 +310,7 @@ rsHandle ui@UIState{ case ev of VtyEvent (EvKey (KChar 'q') []) -> halt ui VtyEvent (EvKey KEsc []) -> continue $ resetScreens d ui - VtyEvent (EvKey (KChar c) []) | c `elem` ['?'] -> continue $ setMode Help ui + VtyEvent (EvKey (KChar c) []) | c == '?' -> continue $ setMode Help ui AppEvent (DateChange old _) | isStandardPeriod p && p `periodContainsDate` old -> continue $ regenerateScreens j d $ setReportPeriod (DayPeriod d) ui where diff --git a/hledger-ui/Hledger/UI/TransactionScreen.hs b/hledger-ui/Hledger/UI/TransactionScreen.hs index 93667f1ba..53ff669e6 100644 --- a/hledger-ui/Hledger/UI/TransactionScreen.hs +++ b/hledger-ui/Hledger/UI/TransactionScreen.hs @@ -154,7 +154,7 @@ tsHandle ui@UIState{aScreen=TransactionScreen{tsTransaction=(i,t), tsTransaction case ev of VtyEvent (EvKey (KChar 'q') []) -> halt ui VtyEvent (EvKey KEsc []) -> continue $ resetScreens d ui - VtyEvent (EvKey (KChar c) []) | c `elem` ['?'] -> continue $ setMode Help ui + VtyEvent (EvKey (KChar c) []) | c == '?' -> continue $ setMode Help ui VtyEvent (EvKey (KChar 'E') []) -> suspendAndResume $ void (runEditor pos f) >> uiReloadJournalIfChanged copts d j ui where (pos,f) = case tsourcepos t of diff --git a/hledger-ui/Hledger/UI/UIOptions.hs b/hledger-ui/Hledger/UI/UIOptions.hs index dc784a96b..584215737 100644 --- a/hledger-ui/Hledger/UI/UIOptions.hs +++ b/hledger-ui/Hledger/UI/UIOptions.hs @@ -88,8 +88,8 @@ checkUIOpts :: UIOpts -> UIOpts checkUIOpts opts = either usageError (const opts) $ do case maybestringopt "theme" $ rawopts_ $ cliopts_ opts of - Just t | not $ elem t themeNames -> Left $ "invalid theme name: "++t - _ -> Right () + Just t | t `notElem` themeNames -> Left $ "invalid theme name: "++t + _ -> Right () -- XXX some refactoring seems due getHledgerUIOpts :: IO UIOpts diff --git a/hledger-web/Hledger/Web/Foundation.hs b/hledger-web/Hledger/Web/Foundation.hs index 48c369052..51af3baad 100644 --- a/hledger-web/Hledger/Web/Foundation.hs +++ b/hledger-web/Hledger/Web/Foundation.hs @@ -245,10 +245,7 @@ shouldShowSidebar = do msidebarcookie <- lookup "showsidebar" . reqCookies <$> getRequest return $ let disablevalues = ["","0"] - in maybe - (not $ msidebarcookie `elem` map Just disablevalues) - (not . (`elem` disablevalues)) - msidebarparam + in maybe True (`notElem` disablevalues) $ msidebarparam <|> msidebarcookie -- | Update our copy of the journal if the file changed. If there is an -- error while reloading, keep the old one and return the error, and set a diff --git a/hledger/Hledger/Cli/Main.hs b/hledger/Hledger/Cli/Main.hs index c66df5269..edfd13f2d 100644 --- a/hledger/Hledger/Cli/Main.hs +++ b/hledger/Hledger/Cli/Main.hs @@ -188,7 +188,7 @@ main = do -- addon commands | isExternalCommand = do - let externalargs = argsbeforecmd ++ filter (not.(=="--")) argsaftercmd + let externalargs = argsbeforecmd ++ filter (/="--") argsaftercmd let shellcmd = printf "%s-%s %s" progname cmd (unwords' externalargs) :: String dbgIO "external command selected" cmd dbgIO "external command arguments" (map quoteIfNeeded externalargs)