From 069d08787421abfb00f8cd6db80ceb3edb82b8ac Mon Sep 17 00:00:00 2001 From: Matthias Heinzel Date: Tue, 3 Dec 2019 21:37:32 +0100 Subject: [PATCH] Fix compilation warnings --- changelog.d/z-ci-tweaks | 2 ++ servant-server/src/Servant/Server/Internal.hs | 6 +++--- servant-server/src/Servant/Server/Internal/DelayedIO.hs | 7 +++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changelog.d/z-ci-tweaks b/changelog.d/z-ci-tweaks index b3e531eb..331e5679 100644 --- a/changelog.d/z-ci-tweaks +++ b/changelog.d/z-ci-tweaks @@ -7,7 +7,9 @@ prs: #1229 #1233 #1242 + #1247 #1250 + #1258 description: { diff --git a/servant-server/src/Servant/Server/Internal.hs b/servant-server/src/Servant/Server/Internal.hs index b9a94035..6b732c11 100644 --- a/servant-server/src/Servant/Server/Internal.hs +++ b/servant-server/src/Servant/Server/Internal.hs @@ -80,7 +80,7 @@ import Servant.API import Servant.API.ContentTypes (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..), AllMime, MimeRender (..), MimeUnrender (..), canHandleAcceptH, - NoContent (NoContent)) + NoContent) import Servant.API.Modifiers (FoldLenient, FoldRequired, RequestArgument, unfoldRequestArgument) @@ -89,7 +89,7 @@ import Servant.API.ResponseHeaders import qualified Servant.Types.SourceT as S import Web.HttpApiData (FromHttpApiData, parseHeader, parseQueryParam, - parseUrlPieceMaybe, parseUrlPieces, parseUrlPiece) + parseUrlPieces, parseUrlPiece) import Servant.Server.Internal.BasicAuth import Servant.Server.Internal.Context @@ -272,7 +272,7 @@ noContentRouter method status action = leafRouter route' where route' env request respond = runAction (action `addMethodCheck` methodCheck method request) - env request respond $ \ output -> + env request respond $ \ _output -> Route $ responseLBS status [] "" instance {-# OVERLAPPABLE #-} diff --git a/servant-server/src/Servant/Server/Internal/DelayedIO.hs b/servant-server/src/Servant/Server/Internal/DelayedIO.hs index 52b6aff5..48f35b9d 100644 --- a/servant-server/src/Servant/Server/Internal/DelayedIO.hs +++ b/servant-server/src/Servant/Server/Internal/DelayedIO.hs @@ -12,13 +12,12 @@ import Control.Monad.Reader import Control.Monad.Trans (MonadIO (..), MonadTrans (..)) import Control.Monad.Trans.Control - (ComposeSt, MonadBaseControl (..), MonadTransControl (..), - defaultLiftBaseWith, defaultRestoreM) + (MonadBaseControl (..)) import Control.Monad.Trans.Resource (MonadResource (..), ResourceT, runInternalState, - runResourceT, transResourceT, withInternalState) + transResourceT, withInternalState) import Network.Wai - (Application, Request, Response, ResponseReceived) + (Request) import Servant.Server.Internal.RouteResult import Servant.Server.Internal.ServerError