Merge pull request #1258 from haskell-servant/pr-1247

PR 1247

changelog.d/z-ci-tweaks

@@ -7,7 +7,9 @@ prs:
   #1229
   #1233
   #1242
+  #1247
   #1250
+  #1258
 
 description: {
 

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 #-}

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

stack.yaml

@@ -1,10 +1,10 @@
-# Let's try to keep resolver at the first day of the month
-resolver: nightly-2018-09-28 # Last nightly with GHC-8.4.3
+resolver: lts-14.17
 packages:
-- servant-client/
 - servant-client-core/
+- servant-client/
 - servant-docs/
 - servant-foreign/
+- servant-http-streams/
 - servant-server/
 - servant/
 
@@ -16,21 +16,4 @@ packages:
 # - doc/tutorial/
 
 extra-deps:
-- base-compat-0.10.5
-- base-orphans-0.8.1
-- conduit-1.3.1
-- hspec-2.6.0
-- hspec-core-2.6.0
-- hspec-discover-2.6.0
-- http-api-data-0.4.1
-- http-media-0.7.1.3
-- http-types-0.12.3
-- network-2.8.0.0
-- pipes-safe-2.3.1
-- QuickCheck-2.12.6.1
-- resourcet-1.2.2
-- sop-core-0.4.0.0
-- time-compat-1.9.2.2
-- unordered-containers-0.2.10.0
-- wai-extra-3.0.24.3
-- tasty-1.1.0.4
+- hspec-wai-0.10.1