From c2212a86e6170ab392029f91eee1ea277f530530 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 4 May 2021 19:40:50 +0200 Subject: [PATCH] refactor: hlint --- .gitlab-ci.yml | 6 ++---- src/Model/Types/Workflow.hs | 28 +++++++--------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 514846b63..b2c28a2b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -271,8 +271,7 @@ yesod:test:hlint: before_script: *haskell script: - stack install hlint - - stack exec -- hlint --cc src > gl-code-quality-report.json - - jq . gl-code-quality-report.json + - stack exec -- hlint --cc src > gl-code-quality-report.json || jq . gl-code-quality-report.json artifacts: paths: @@ -307,8 +306,7 @@ yesod:test:hlint:dev: before_script: *haskell script: - stack install hlint - - stack exec -- hlint --cc src > gl-code-quality-report.json - - jq . gl-code-quality-report.json + - stack exec -- hlint --cc src > gl-code-quality-report.json || jq . gl-code-quality-report.json artifacts: paths: diff --git a/src/Model/Types/Workflow.hs b/src/Model/Types/Workflow.hs index b9c0a0f73..ada4ef374 100644 --- a/src/Model/Types/Workflow.hs +++ b/src/Model/Types/Workflow.hs @@ -1132,27 +1132,13 @@ instance Binary userid => Binary (WorkflowRole userid) instance (Binary fileid, Binary userid, Typeable fileid, Typeable userid) => Binary (WorkflowAction fileid userid) instance (Binary fileid, Binary userid, Typeable fileid, Typeable userid) => Binary (WorkflowFieldPayloadW fileid userid) where - get = do - tag <- Binary.get - case tag of - WFPText' -> do - t <- Binary.get - return $ WorkflowFieldPayloadW $ WFPText t - WFPNumber' -> do - n <- Binary.get - return $ WorkflowFieldPayloadW $ WFPNumber n - WFPBool' -> do - b <- Binary.get - return $ WorkflowFieldPayloadW $ WFPBool b - WFPDay' -> do - d <- Binary.get - return $ WorkflowFieldPayloadW $ WFPDay d - WFPFile' -> do - fid <- Binary.get - return $ WorkflowFieldPayloadW $ WFPFile fid - WFPUser' -> do - uid <- Binary.get - return $ WorkflowFieldPayloadW $ WFPUser uid + get = Binary.get >>= \case + WFPText' -> WorkflowFieldPayloadW . WFPText <$> Binary.get + WFPNumber' -> WorkflowFieldPayloadW . WFPNumber <$> Binary.get + WFPBool' -> WorkflowFieldPayloadW . WFPBool <$> Binary.get + WFPDay' -> WorkflowFieldPayloadW . WFPDay <$> Binary.get + WFPFile' -> WorkflowFieldPayloadW . WFPFile <$> Binary.get + WFPUser' -> WorkflowFieldPayloadW . WFPUser <$> Binary.get put = \case WorkflowFieldPayloadW (WFPText t ) -> Binary.put WFPText' >> Binary.put t WorkflowFieldPayloadW (WFPNumber n ) -> Binary.put WFPNumber' >> Binary.put n