diff --git a/.hlint.yaml b/.hlint.yaml index d4d694de2..02b12275b 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -50,7 +50,6 @@ - ignore: {name: "Redundant bang pattern"} - ignore: {name: "Use zipWith"} - ignore: {name: "Replace case with maybe"} -- ignore: {name: "Redundant return"} - ignore: {name: "Avoid lambda using `infix`"} - ignore: {name: "Use <|>"} - ignore: {name: "Use zip"} diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs index fa4dc1299..6f5898793 100644 --- a/hledger-lib/Hledger/Read/Common.hs +++ b/hledger-lib/Hledger/Read/Common.hs @@ -986,7 +986,6 @@ lotpricep = label "ledger-style lot price" $ do lift skipNonNewlineSpaces char '}' when (doublebrace) $ void $ char '}' - return () -- Parse a Ledger-style lot date [DATE], and ignore it. -- https://www.ledger-cli.org/3.0/doc/ledger3.html#Fixing-Lot-Prices . diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs index cd6d7e18b..c0e763443 100644 --- a/hledger-lib/Hledger/Read/CsvReader.hs +++ b/hledger-lib/Hledger/Read/CsvReader.hs @@ -1266,8 +1266,7 @@ csvFieldValue :: CsvRules -> CsvRecord -> CsvFieldName -> Maybe Text csvFieldValue rules record fieldname = do fieldindex <- if | T.all isDigit fieldname -> readMay $ T.unpack fieldname | otherwise -> lookup (T.toLower fieldname) $ rcsvfieldindexes rules - fieldvalue <- T.strip <$> atMay record (fieldindex-1) - return fieldvalue + T.strip <$> atMay record (fieldindex-1) -- | Parse the date string using the specified date-format, or if unspecified -- the "simple date" formats (YYYY/MM/DD, YYYY-MM-DD, YYYY.MM.DD, leading diff --git a/hledger-lib/Hledger/Utils/String.hs b/hledger-lib/Hledger/Utils/String.hs index b597df46a..097a326b9 100644 --- a/hledger-lib/Hledger/Utils/String.hs +++ b/hledger-lib/Hledger/Utils/String.hs @@ -134,9 +134,8 @@ words' :: String -> [String] words' "" = [] words' s = map stripquotes $ fromparse $ parsewithString p s where - p = do ss <- (singleQuotedPattern <|> doubleQuotedPattern <|> patterns) `sepBy` skipNonNewlineSpaces1 - -- eof - return ss + p = (singleQuotedPattern <|> doubleQuotedPattern <|> patterns) `sepBy` skipNonNewlineSpaces1 + -- eof patterns = many (noneOf whitespacechars) singleQuotedPattern = between (char '\'') (char '\'') (many $ noneOf "'") doubleQuotedPattern = between (char '"') (char '"') (many $ noneOf "\"") diff --git a/tools/generatejournal.hs b/tools/generatejournal.hs index 441af229c..609443726 100755 --- a/tools/generatejournal.hs +++ b/tools/generatejournal.hs @@ -35,7 +35,6 @@ main = do let rates = [0.70, 0.71 .. 1.3] mapM_ (\(n,d,(a,b),c,p) -> putStr $ showtxn n d a b c p) $ take numtxns $ zip5 [1..] dates accts comms (drop 1 comms) mapM_ (\(d,rate) -> putStr $ showmarketprice d rate) $ take numtxns $ zip dates (cycle $ rates ++ init (tail (reverse rates))) - return () showtxn :: Int -> Day -> String -> String -> Char -> Char -> String showtxn txnno date acct1 acct2 comm pricecomm = diff --git a/tools/generatetimeclock.hs b/tools/generatetimeclock.hs index 7770db33d..eab0d38d0 100644 --- a/tools/generatetimeclock.hs +++ b/tools/generatetimeclock.hs @@ -20,7 +20,6 @@ main = do today <- getCurrentDay let startdate = addDays (-numentries) today mapM_ (putStr . showentry) [startdate..today] - return () showentry d = printf "i %s 09:00:00 dummy\no %s 17:00:00\n" (show d) (show d)