From 0c5a864986c6ed32b8c099c7bf4f4b4b74043aac Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Thu, 21 Jan 2016 22:06:14 +0100 Subject: [PATCH] Remove some more warnings --- Handler/Journal.hs | 2 +- Handler/Modify.hs | 2 +- Handler/Supplier.hs | 1 - yammat.cabal | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Handler/Journal.hs b/Handler/Journal.hs index 3f37efb..dbfc52d 100755 --- a/Handler/Journal.hs +++ b/Handler/Journal.hs @@ -41,7 +41,7 @@ merge [] (c:cs) = (Right $ entityVal c) : merge [] cs merge (t:ts) [] = (Left $ entityVal t) : merge ts [] merge (t:ts) (c:cs) | transactionTime (entityVal t) < cashCheckTime (entityVal c) = (Left $ entityVal t) : merge ts (c:cs) - | transactionTime (entityVal t) > cashCheckTime (entityVal c) = (Right $ entityVal c) : merge (t:ts) cs + | otherwise = (Right $ entityVal c) : merge (t:ts) cs getJournalPageR :: Int -> Handler Html getJournalPageR p = do diff --git a/Handler/Modify.hs b/Handler/Modify.hs index 0eeb1bb..ab991e5 100755 --- a/Handler/Modify.hs +++ b/Handler/Modify.hs @@ -110,7 +110,7 @@ getDeleteBeverageR :: BeverageId -> Handler Html getDeleteBeverageR bId = do mBev <- runDB $ get bId case mBev of - Just bev -> do + Just _ -> do runDB $ delete bId setMessageI MsgItemDeleted redirect HomeR diff --git a/Handler/Supplier.hs b/Handler/Supplier.hs index 857ebd7..fcba778 100755 --- a/Handler/Supplier.hs +++ b/Handler/Supplier.hs @@ -103,7 +103,6 @@ modifySupplierForm sup = SupConf <*> aopt (selectField avatars) (bfs MsgSelectAvatar) (Just $ supplierAvatar sup) <* bootstrapSubmit (msgToBSSubmit MsgSubmit) where - master = getYesod avatars = do ents <- runDB $ selectList [] [Asc AvatarIdent] optionsPairs $ map (\ent -> ((avatarIdent $ entityVal ent), entityKey ent)) ents diff --git a/yammat.cabal b/yammat.cabal index 15b66b0..2369bab 100755 --- a/yammat.cabal +++ b/yammat.cabal @@ -90,7 +90,7 @@ library , aeson >= 0.6 && < 0.11 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4 - , fast-logger >= 2.2 && < 2.3 + , fast-logger >= 2.2 , wai-logger >= 2.2 && < 2.3 , file-embed , safe