git.iko.soy/servant
on master help sign in
Merge pull request #1258 from haskell-servant/pr-1247

PR 1247

commit9536f1d853a43321a861da1a32b4d3838f768878 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 15 Dec 2019, 18:23 (7 years ago) parent4ece88e069d087
4 files changed+12−28
compare with master
unifiedsplit
changelog.d/z-ci-tweaks+2 servant-server/src/Servant/Server/Internal.hs+3−3 servant-server/src/Servant/Server/Internal/DelayedIO.hs+3−4 stack.yaml+4−21
changelog.d/z-ci-tweaks+2
@@ -7,7 +7,9 @@ prs:
77 #1229
88 #1233
99 #1242
10+ #1247
1011 #1250
12+ #1258
1113
1214description: {
1315
servant-server/src/Servant/Server/Internal.hs+3−3
@@ -80,7 +80,7 @@ import Servant.API
8080import Servant.API.ContentTypes
8181 (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
8282 AllMime, MimeRender (..), MimeUnrender (..), canHandleAcceptH,
83− NoContent (NoContent))
83+ NoContent)
8484import Servant.API.Modifiers
8585 (FoldLenient, FoldRequired, RequestArgument,
8686 unfoldRequestArgument)
@@ -89,7 +89,7 @@ import Servant.API.ResponseHeaders
8989import qualified Servant.Types.SourceT as S
9090import Web.HttpApiData
9191 (FromHttpApiData, parseHeader, parseQueryParam,
92− parseUrlPieceMaybe, parseUrlPieces, parseUrlPiece)
92+ parseUrlPieces, parseUrlPiece)
9393
9494import Servant.Server.Internal.BasicAuth
9595import Servant.Server.Internal.Context
@@ -272,7 +272,7 @@ noContentRouter method status action = leafRouter route'
272272 where
273273 route' env request respond =
274274 runAction (action `addMethodCheck` methodCheck method request)
275− env request respond $ \ output ->
275+ env request respond $ \ _output ->
276276 Route $ responseLBS status [] ""
277277
278278instance {-# OVERLAPPABLE #-}
servant-server/src/Servant/Server/Internal/DelayedIO.hs+3−4
@@ -12,13 +12,12 @@ import Control.Monad.Reader
1212import Control.Monad.Trans
1313 (MonadIO (..), MonadTrans (..))
1414import Control.Monad.Trans.Control
15− (ComposeSt, MonadBaseControl (..), MonadTransControl (..),
16− defaultLiftBaseWith, defaultRestoreM)
15+ (MonadBaseControl (..))
1716import Control.Monad.Trans.Resource
1817 (MonadResource (..), ResourceT, runInternalState,
19− runResourceT, transResourceT, withInternalState)
18+ transResourceT, withInternalState)
2019import Network.Wai
21− (Application, Request, Response, ResponseReceived)
20+ (Request)
2221
2322import Servant.Server.Internal.RouteResult
2423import 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
2−resolver: nightly-2018-09-28 # Last nightly with GHC-8.4.3
1+resolver: lts-14.17
32packages:
4−- servant-client/
53- servant-client-core/
4+- servant-client/
65- servant-docs/
76- servant-foreign/
7+- servant-http-streams/
88- servant-server/
99- servant/
1010
@@ -16,21 +16,4 @@ packages:
1616# - doc/tutorial/
1717
1818extra-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
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
19+- hspec-wai-0.10.1