git.iko.soy/servant
on master help sign in
Merge pull request #1258 from haskell-servant/pr-1247
9536f1dOleg Grenrus
changelog.d/z-ci-tweaks+2
compare with master
unifiedsplit
@@ -7,7 +7,9 @@ prs:
7 #1229
7 #1229
8 #1233
8 #1233
9 #1242
9 #1242
10+ #1247
10 #1250
11 #1250
12+ #1258
11
13
12description: {
14description: {
13
15
servant-server/src/Servant/Server/Internal.hs+3−3
@@ -80,7 +80,7 @@ import Servant.API
80import Servant.API.ContentTypes
80import Servant.API.ContentTypes
81 (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
81 (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
82 AllMime, MimeRender (..), MimeUnrender (..), canHandleAcceptH,
82 AllMime, MimeRender (..), MimeUnrender (..), canHandleAcceptH,
83− NoContent (NoContent))
83+ NoContent)
84import Servant.API.Modifiers
84import Servant.API.Modifiers
85 (FoldLenient, FoldRequired, RequestArgument,
85 (FoldLenient, FoldRequired, RequestArgument,
86 unfoldRequestArgument)
86 unfoldRequestArgument)
@@ -89,7 +89,7 @@ import Servant.API.ResponseHeaders
89import qualified Servant.Types.SourceT as S
89import qualified Servant.Types.SourceT as S
90import Web.HttpApiData
90import Web.HttpApiData
91 (FromHttpApiData, parseHeader, parseQueryParam,
91 (FromHttpApiData, parseHeader, parseQueryParam,
92− parseUrlPieceMaybe, parseUrlPieces, parseUrlPiece)
92+ parseUrlPieces, parseUrlPiece)
93
93
94import Servant.Server.Internal.BasicAuth
94import Servant.Server.Internal.BasicAuth
95import Servant.Server.Internal.Context
95import Servant.Server.Internal.Context
@@ -272,7 +272,7 @@ noContentRouter method status action = leafRouter route'
272 where
272 where
273 route' env request respond =
273 route' env request respond =
274 runAction (action `addMethodCheck` methodCheck method request)
274 runAction (action `addMethodCheck` methodCheck method request)
275− env request respond $ \ output ->
275+ env request respond $ \ _output ->
276 Route $ responseLBS status [] ""
276 Route $ responseLBS status [] ""
277
277
278instance {-# OVERLAPPABLE #-}
278instance {-# OVERLAPPABLE #-}
servant-server/src/Servant/Server/Internal/DelayedIO.hs+3−4
@@ -12,13 +12,12 @@ import Control.Monad.Reader
12import Control.Monad.Trans
12import Control.Monad.Trans
13 (MonadIO (..), MonadTrans (..))
13 (MonadIO (..), MonadTrans (..))
14import Control.Monad.Trans.Control
14import Control.Monad.Trans.Control
15− (ComposeSt, MonadBaseControl (..), MonadTransControl (..),
15+ (MonadBaseControl (..))
16− defaultLiftBaseWith, defaultRestoreM)
17import Control.Monad.Trans.Resource
16import Control.Monad.Trans.Resource
18 (MonadResource (..), ResourceT, runInternalState,
17 (MonadResource (..), ResourceT, runInternalState,
19− runResourceT, transResourceT, withInternalState)
18+ transResourceT, withInternalState)
20import Network.Wai
19import Network.Wai
21− (Application, Request, Response, ResponseReceived)
20+ (Request)
22
21
23import Servant.Server.Internal.RouteResult
22import Servant.Server.Internal.RouteResult
24import Servant.Server.Internal.ServerError
23import Servant.Server.Internal.ServerError
stack.yaml+4−21
@@ -1,10 +1,10 @@
1−# Let's try to keep resolver at the first day of the month
1+resolver: lts-14.17
2−resolver: nightly-2018-09-28 # Last nightly with GHC-8.4.3
3packages:
2packages:
4−- servant-client/
5- servant-client-core/
3- servant-client-core/
4+- servant-client/
6- servant-docs/
5- servant-docs/
7- servant-foreign/
6- servant-foreign/
7+- servant-http-streams/
8- servant-server/
8- servant-server/
9- servant/
9- servant/
10
10
@@ -16,21 +16,4 @@ packages:
16# - doc/tutorial/
16# - doc/tutorial/
17
17
18extra-deps:
18extra-deps:
19−- base-compat-0.10.5
20−- base-orphans-0.8.1
21−- conduit-1.3.1
22−- hspec-2.6.0
23−- hspec-core-2.6.0
19+- hspec-wai-0.10.1
24−- hspec-discover-2.6.0
25−- http-api-data-0.4.1
26−- http-media-0.7.1.3
27−- http-types-0.12.3
28−- network-2.8.0.0
29−- pipes-safe-2.3.1
30−- QuickCheck-2.12.6.1
31−- resourcet-1.2.2
32−- sop-core-0.4.0.0
33−- time-compat-1.9.2.2
34−- unordered-containers-0.2.10.0
35−- wai-extra-3.0.24.3
36−- tasty-1.1.0.4