@@ -14,8 +14,6 @@ import Data.Aeson.Parser
14import Data.Aeson.Types
14import Data.Aeson.Types
15import Data.Attoparsec.ByteString
15import Data.Attoparsec.ByteString
16import Data.ByteString.Lazy hiding (pack, filter, map, null)
16import Data.ByteString.Lazy hiding (pack, filter, map, null)
17−import qualified Data.ByteString as BS
18−import qualified Data.ByteString.Char8 as BSC
19import Data.String
17import Data.String
20import Data.String.Conversions
18import Data.String.Conversions
21import Data.Text (Text)
19import Data.Text (Text)
@@ -84,16 +82,16 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort) =
84 , uriPath = reqPath req
82 , uriPath = reqPath req
87− setrqb r = case (reqBody req) of
85+ setrqb r = case reqBody req of
88 Nothing -> r
86 Nothing -> r
89 Just (b,t) -> r { requestBody = RequestBodyLBS b
87 Just (b,t) -> r { requestBody = RequestBodyLBS b
90 , requestHeaders = requestHeaders r
88 , requestHeaders = requestHeaders r
91 ++ [(hContentType, cs . show $ t)] }
89 ++ [(hContentType, cs . show $ t)] }
92 setQS = setQueryString $ queryTextToQuery (qs req)
90 setQS = setQueryString $ queryTextToQuery (qs req)
93 setheaders r = r { requestHeaders = requestHeaders r
91 setheaders r = r { requestHeaders = requestHeaders r
94− ++ Prelude.map toProperHeader (headers req) }
92+ <> fmap toProperHeader (headers req) }
95 setAccept r = r { requestHeaders = filter ((/= "Accept") . fst) (requestHeaders r)
93 setAccept r = r { requestHeaders = filter ((/= "Accept") . fst) (requestHeaders r)
96− ++ [("Accept", renderHeader $ reqAccept req)
94+ <> [("Accept", renderHeader $ reqAccept req)
97 | not . null . reqAccept $ req] }
95 | not . null . reqAccept $ req] }
98 toProperHeader (name, val) =
96 toProperHeader (name, val) =
99 (fromString name, encodeUtf8 val)
97 (fromString name, encodeUtf8 val)
@@ -139,7 +137,7 @@ performRequest reqMethod req isWantedStatus reqHost = do
139 Just t -> case parseAccept t of
137 Just t -> case parseAccept t of
140 Nothing -> left $ "invalid Content-Type header: " <> cs t
138 Nothing -> left $ "invalid Content-Type header: " <> cs t
141 Just t' -> pure t'
139 Just t' -> pure t'
142− return $ (statusCode status, Client.responseBody response, ct)
140+ return (statusCode status, Client.responseBody response, ct)
144 showStatus (Status code message) =
142 showStatus (Status code message) =
145 show code ++ " - " ++ cs message
143 show code ++ " - " ++ cs message