git.iko.soy/servant
on master help sign in
Review fixes
commit501212e6b9b141691090161901d46661a4706cf3 authorJulian K. Arni <jkarni@gmail.com> dateFri 2 Sep 2016, 10:25 (10 years ago) parent7cdebce
5 files changed+9−20
compare with master
unifiedsplit
servant-client/servant-client.cabal+1−1 servant-client/test/Servant/ClientSpec.hs+4−5 servant-server/servant-server.cabal+1−1 servant-server/src/Servant/Server/Internal.hs+1−10 servant/src/Servant/API/ContentTypes.hs+2−3
servant-client/servant-client.cabal+1−1
@@ -41,7 +41,7 @@ library
4141 , base64-bytestring >= 1.0.0.1 && < 1.1
4242 , bytestring >= 0.10 && < 0.11
4343 , exceptions >= 0.8 && < 0.9
44− , http-api-data >= 0.1 && < 0.4
44+ , http-api-data >= 0.3 && < 0.4
4545 , http-client >= 0.4.18.1 && < 0.6
4646 , http-client-tls >= 0.2.2 && < 0.4
4747 , http-media >= 0.6.2 && < 0.7
servant-client/test/Servant/ClientSpec.hs+4−5
@@ -30,7 +30,7 @@ module Servant.ClientSpec where
3030import Control.Applicative ((<$>))
3131#endif
3232import Control.Arrow (left)
33−import Control.Concurrent (ThreadId, forkIO, killThread)
33+import Control.Concurrent (forkIO, killThread, ThreadId)
3434import Control.Exception (bracket)
3535import Control.Monad.Trans.Except (throwE )
3636import Data.Aeson
@@ -44,8 +44,7 @@ import qualified Network.HTTP.Client as C
4444import Network.HTTP.Media
4545import qualified Network.HTTP.Types as HTTP
4646import Network.Socket
47−import Network.Wai (Request, requestHeaders,
48− responseLBS)
47+import Network.Wai (Request, requestHeaders, responseLBS)
4948import Network.Wai.Handler.Warp
5049import System.IO.Unsafe (unsafePerformIO)
5150import Test.Hspec
@@ -121,9 +120,9 @@ getBody :: Person -> SCR.ClientM Person
121120getQueryParam :: Maybe String -> SCR.ClientM Person
122121getQueryParams :: [String] -> SCR.ClientM [Person]
123122getQueryFlag :: Bool -> SCR.ClientM Bool
124−getRawSuccess :: HTTP.Method
123+getRawSuccess :: HTTP.Method
125124 -> SCR.ClientM (Int, BS.ByteString, MediaType, [HTTP.Header], C.Response BS.ByteString)
126−getRawFailure :: HTTP.Method
125+getRawFailure :: HTTP.Method
127126 -> SCR.ClientM (Int, BS.ByteString, MediaType, [HTTP.Header], C.Response BS.ByteString)
128127getMultiple :: String -> Maybe Int -> Bool -> [(String, [Rational])]
129128 -> SCR.ClientM (String, Maybe Int, Bool, [(String, [Rational])])
servant-server/servant-server.cabal+1−1
@@ -52,7 +52,7 @@ library
5252 , base64-bytestring >= 1.0 && < 1.1
5353 , bytestring >= 0.10 && < 0.11
5454 , containers >= 0.5 && < 0.6
55− , http-api-data >= 0.1 && < 0.4
55+ , http-api-data >= 0.3 && < 0.4
5656 , http-types >= 0.8 && < 0.10
5757 , network-uri >= 2.6 && < 2.7
5858 , mtl >= 2 && < 2.3
servant-server/src/Servant/Server/Internal.hs+1−10
@@ -42,19 +42,10 @@ import Network.Wai (Application, Request, Response,
4242 responseLBS, vault)
4343import Prelude ()
4444import Prelude.Compat
45−import Web.HttpApiData (FromHttpApiData)
46−#if MIN_VERSION_http_api_data(0,3,0)
47−import Web.Internal.HttpApiData (parseHeaderMaybe,
45+import Web.HttpApiData (FromHttpApiData, parseHeaderMaybe,
4846 parseQueryParamMaybe,
4947 parseUrlPieceMaybe,
5048 parseUrlPieces)
51−#else
52−import Web.HttpApiData.Internal (parseHeaderMaybe,
53− parseQueryParamMaybe,
54− parseUrlPieceMaybe,
55− parseUrlPieces)
56−#endif
57−
5849import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,
5950 CaptureAll, Verb,
6051 ReflectMethod(reflectMethod),
servant/src/Servant/API/ContentTypes.hs+2−3
@@ -72,8 +72,7 @@ module Servant.API.ContentTypes
7272
7373import Control.Arrow (left)
7474import Control.Monad.Compat
75−import Data.Aeson (FromJSON (..), ToJSON (..),
76− encode)
75+import Data.Aeson (FromJSON(..), ToJSON(..), encode)
7776import Data.Aeson.Parser (value)
7877import Data.Aeson.Types (parseEither)
7978import Data.Attoparsec.ByteString.Char8 (endOfInput, parseOnly,
@@ -288,7 +287,7 @@ instance OVERLAPPABLE_
288287 ToJSON a => MimeRender JSON a where
289288 mimeRender _ = encode
290289
291−-- | @urlEncodeAsForm"
290+-- | @urlEncodeAsForm@
292291-- Note that the @mimeUnrender p (mimeRender p x) == Right x@ law only
293292-- holds if every element of x is non-null (i.e., not @("", "")@)
294293instance OVERLAPPABLE_