2e5974f · typeable/req

.github/workflows/ci.yaml+1−1

compare with master

unifiedsplit

@@ -19,7 +19,7 @@ jobs:

19 strategy:

20 matrix:

21 cabal: ["3.6"]

22− ghc: ["8.8.4", "8.10.7", "9.0.2"]

22+ ghc: ["8.10.7", "9.0.2", "9.2.1"]

23 env:

24 CONFIG: "--enable-tests --enable-benchmarks --flags=dev"

25 steps:

Network/HTTP/Req.hs+1−1

@@ -251,7 +251,7 @@ import Data.List.NonEmpty (NonEmpty (..))

251import qualified Data.List.NonEmpty as NE

252import Data.Maybe (fromMaybe)

253import Data.Proxy

254−import Data.Semigroup hiding (Option, option)

254+import Data.Semigroup (Endo (..))

255import Data.Text (Text)

256import qualified Data.Text as T

257import qualified Data.Text.Encoding as T

httpbin-tests/Network/HTTP/ReqSpec.hs+2−1

@@ -16,6 +16,7 @@ import qualified Data.Aeson.KeyMap as Aeson.KeyMap

16import qualified Data.ByteString as B

17import qualified Data.ByteString.Lazy as BL

18import Data.Functor.Identity (runIdentity)

19+import Data.Maybe (fromJust)

19import Data.Proxy

20import Data.Proxy

20import Data.Text (Text)

21import Data.Text (Text)

21import qualified Data.Text as T

22import qualified Data.Text as T

@@ -135,7 +136,7 @@ spec = do

135 LM.partBS "bar" "bar data!"

136 LM.partBS "bar" "bar data!"

136 ]

137 ]

137 r <- req POST (httpbin /: "post") body jsonResponse mempty

138 r <- req POST (httpbin /: "post") body jsonResponse mempty

138− let Just contentType = getRequestContentType body

139+ let contentType = fromJust (getRequestContentType body)

139 (stripFunnyHeaders . stripOrigin) (responseBody r)

140 (stripFunnyHeaders . stripOrigin) (responseBody r)

140 `shouldBe` object

141 `shouldBe` object

141 [ "args" .= emptyObject,

142 [ "args" .= emptyObject,

pure-tests/Network/HTTP/ReqSpec.hs+6−4

@@ -159,11 +159,13 @@ spec = do

159 let uriHttp = uri' {URI.uriScheme = Just [QQ.scheme|http|]}

160 uriHttps = uri' {URI.uriScheme = Just [QQ.scheme|https|]}

161 requestHttp <-

162− let Left (url', options) = fromJust (useURI uriHttp)

162+ case fromJust (useURI uriHttp) of

163− in req_ GET url' NoReqBody options

163+ Left (url', options) -> req_ GET url' NoReqBody options

164+ _ -> error "(useURI uriHttp) should have returned Left"

164 requestHttps <-

165 requestHttps <-

165− let Right (url', options) = fromJust (useURI uriHttps)

166+ case fromJust (useURI uriHttps) of

166− in req_ GET url' NoReqBody options

167+ Right (url', options) -> req_ GET url' NoReqBody options

168+ _ -> error "(useURI uriHttps) should have returned Right"

167 L.host requestHttp `shouldBe` uriHost uriHttp

169 L.host requestHttp `shouldBe` uriHost uriHttp

168 L.host requestHttps `shouldBe` uriHost uriHttps

170 L.host requestHttps `shouldBe` uriHost uriHttps

169 L.port requestHttp `shouldBe` uriPort 80 uriHttp

171 L.port requestHttp `shouldBe` uriPort 80 uriHttp

req.cabal+3−3

@@ -5,7 +5,7 @@ license: BSD-3-Clause

5license-file: LICENSE.md

6maintainer: Mark Karpov <markkarpov92@gmail.com>

7author: Mark Karpov <markkarpov92@gmail.com>

8−tested-with: ghc ==8.8.4 ghc ==8.10.7 ghc ==9.0.2

8+tested-with: ghc ==8.10.7 ghc ==9.0.2 ghc ==9.2.1

9homepage: https://github.com/mrkkrp/req

10bug-reports: https://github.com/mrkkrp/req/issues

11synopsis: HTTP client library

@@ -49,7 +49,7 @@ library

49 monad-control >=1.0 && <1.1,

50 mtl >=2.0 && <3.0,

51 retry >=0.8 && <0.10,

52− template-haskell >=2.14 && <2.18,

52+ template-haskell >=2.14 && <2.19,

53 text >=0.2 && <1.3,

54 time >=1.2 && <1.13,

55 transformers >=0.5.3.0 && <0.6,

@@ -89,7 +89,7 @@ test-suite pure-tests

89 mtl >=2.0 && <3.0,

90 req,

91 retry >=0.8 && <0.10,

92− template-haskell >=2.14 && <2.18,

92+ template-haskell >=2.14 && <2.19,

93 text >=0.2 && <1.3,

94 time >=1.2 && <1.13

95