From 69502c44fe5892dc594e5face3f95dbda6b2cc1d Mon Sep 17 00:00:00 2001 From: Stephen Morgan Date: Mon, 16 Aug 2021 16:49:50 +1000 Subject: [PATCH] cln: hlint: Fix record patterns warnings. --- .hlint.yaml | 1 - hledger-lib/Hledger/Read/Common.hs | 2 +- hledger-ui/Hledger/UI/AccountsScreen.hs | 8 ++++---- hledger-ui/Hledger/UI/RegisterScreen.hs | 8 ++++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.hlint.yaml b/.hlint.yaml index 02b12275b..bce2e1ed2 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -26,7 +26,6 @@ - ignore: {name: "Use fmap"} - ignore: {name: "Use curry"} - ignore: {name: "Redundant uncurry"} -- ignore: {name: "Use record patterns"} - ignore: {name: "Redundant fromIntegral"} - ignore: {name: "Use <&>"} - ignore: {name: "Use sortOn"} diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs index 6f5898793..ef9b29bdf 100644 --- a/hledger-lib/Hledger/Read/Common.hs +++ b/hledger-lib/Hledger/Read/Common.hs @@ -1040,7 +1040,7 @@ fromRawNumber -> Maybe Integer -> Either String (Quantity, Word8, Maybe Char, Maybe DigitGroupStyle) -fromRawNumber (WithSeparators _ _ _) (Just _) = +fromRawNumber (WithSeparators{}) (Just _) = Left "invalid number: digit separators and exponents may not be used together" fromRawNumber raw mExp = do (quantity, precision) <- toQuantity (fromMaybe 0 mExp) (digitGroup raw) (decimalGroup raw) diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index f87c940b2..a0173f07c 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -250,8 +250,8 @@ asHandle ui0@UIState{ VtyEvent ev -> do ed' <- handleEditorEvent ev ed continue $ ui{aMode=Minibuffer ed'} AppEvent _ -> continue ui - MouseDown _ _ _ _ -> continue ui - MouseUp _ _ _ -> continue ui + MouseDown{} -> continue ui + MouseUp{} -> continue ui Help -> case ev of @@ -356,8 +356,8 @@ asHandle ui0@UIState{ } AppEvent _ -> continue ui - MouseDown _ _ _ _ -> continue ui - MouseUp _ _ _ -> continue ui + MouseDown{} -> continue ui + MouseUp{} -> continue ui where journalspan = journalDateSpan False j diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs index 33c84a258..4a0910d45 100644 --- a/hledger-ui/Hledger/UI/RegisterScreen.hs +++ b/hledger-ui/Hledger/UI/RegisterScreen.hs @@ -296,8 +296,8 @@ rsHandle ui@UIState{ VtyEvent ev -> do ed' <- handleEditorEvent ev ed continue $ ui{aMode=Minibuffer ed'} AppEvent _ -> continue ui - MouseDown _ _ _ _ -> continue ui - MouseUp _ _ _ -> continue ui + MouseDown{} -> continue ui + MouseUp{} -> continue ui Help -> case ev of @@ -384,8 +384,8 @@ rsHandle ui@UIState{ continue ui{aScreen=s{rsList=newitems}} AppEvent _ -> continue ui - MouseDown _ _ _ _ -> continue ui - MouseUp _ _ _ -> continue ui + MouseDown{} -> continue ui + MouseUp{} -> continue ui rsHandle _ _ = error "event handler called with wrong screen type, should not happen" -- PARTIAL: