diff --git a/.hlint.yaml b/.hlint.yaml index d919816d41..805c927209 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -15,3 +15,6 @@ # custom rules: - hint: { lhs: (() <$), rhs: void } - hint: { lhs: return, rhs: pure } +## We want the latter to properly handle signals. +- error: { name: Use shutdown, lhs: runSettings, rhs: runSettingsWithShutdown } +- ignore: { name: Use shutdown, within: [Network.Wai.Utilities.Server, Federator.Response] } diff --git a/libs/wire-api/src/Wire/API/MLS/CommitBundle.hs b/libs/wire-api/src/Wire/API/MLS/CommitBundle.hs index dfe09f0b88..67ebd6fd5d 100644 --- a/libs/wire-api/src/Wire/API/MLS/CommitBundle.hs +++ b/libs/wire-api/src/Wire/API/MLS/CommitBundle.hs @@ -14,7 +14,6 @@ -- -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -{-# LANGUAGE RecordWildCards #-} module Wire.API.MLS.CommitBundle where diff --git a/services/galley/src/Galley/API/MLS/Message.hs b/services/galley/src/Galley/API/MLS/Message.hs index e2283ef4c6..e5c6334977 100644 --- a/services/galley/src/Galley/API/MLS/Message.hs +++ b/services/galley/src/Galley/API/MLS/Message.hs @@ -14,7 +14,6 @@ -- -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -{-# LANGUAGE RecordWildCards #-} module Galley.API.MLS.Message ( postMLSCommitBundle, @@ -1027,8 +1026,7 @@ executeProposalAction qusr con lconv cm action = do existingLocalMembers :: Set (Qualified UserId) existingLocalMembers = - Set.fromList . map (fmap lmId . qUntagged) . sequenceA $ - fmap convLocalMembers lconv + (Set.fromList . map (fmap lmId . qUntagged)) (traverse convLocalMembers lconv) existingRemoteMembers :: Set (Qualified UserId) existingRemoteMembers = diff --git a/services/galley/src/Galley/API/MLS/Propagate.hs b/services/galley/src/Galley/API/MLS/Propagate.hs index 6af4e1d61b..8356619baa 100644 --- a/services/galley/src/Galley/API/MLS/Propagate.hs +++ b/services/galley/src/Galley/API/MLS/Propagate.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE RecordWildCards #-} - -- This file is part of the Wire Server implementation. -- -- Copyright (C) 2022 Wire Swiss GmbH diff --git a/tools/hlint.sh b/tools/hlint.sh index 1ae13906cb..35a7cc7dcc 100755 --- a/tools/hlint.sh +++ b/tools/hlint.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -euo pipefail - usage() { echo "Usage: $0 -f [all, changeset] -m [check, inplace]" 1>&2; exit 1; } files=''