65c2cbb · typeable/servant

servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs+3−2

compare with master

unifiedsplit

@@ -14,15 +14,16 @@

14#include "overlapping-compat.h"

15module Servant.Client.Core.Internal.HasClient where

16

17+import Prelude ()

17import Prelude.Compat

18import Prelude.Compat

18−import Prelude ()

19

20import Control.Monad.Error.Class (throwError)

21+import Data.Foldable (toList)

21import Data.List (foldl')

22import Data.List (foldl')

22import Data.Proxy (Proxy (Proxy))

23import Data.Proxy (Proxy (Proxy))

24+import Data.Sequence (fromList)

23import Data.String (fromString)

25import Data.String (fromString)

24import Data.Text (pack)

26import Data.Text (pack)

25−import GHC.Exts (fromList, toList)

26import GHC.TypeLits (KnownSymbol, symbolVal)

27import GHC.TypeLits (KnownSymbol, symbolVal)

27import qualified Network.HTTP.Types as H

28import qualified Network.HTTP.Types as H

28import Servant.API ((:<|>) ((:<|>)), (:>),

29import Servant.API ((:<|>) ((:<|>)), (:>),

servant-client/servant-client.cabal+2−1

@@ -37,7 +37,8 @@ library

37 , bytestring >= 0.10 && < 0.11

38 , aeson >= 0.7 && < 1.3

39 , attoparsec >= 0.12 && < 0.14

40+ , containers >= 0.5 && < 0.6

40− , http-client >= 0.4.18.1 && < 0.6

41+ , http-client >= 0.4.30 && < 0.6

41 , http-client-tls >= 0.2.2 && < 0.4

42 , http-client-tls >= 0.2.2 && < 0.4

42 , http-media >= 0.6.2 && < 0.8

43 , http-media >= 0.6.2 && < 0.8

43 , http-types >= 0.8.6 && < 0.10

44 , http-types >= 0.8.6 && < 0.10

servant-client/src/Servant/Client/Internal/HttpClient.hs+1−1

@@ -30,9 +30,9 @@ import Data.Foldable (toList)

30import Data.Functor.Alt (Alt (..))

31import Data.Monoid ((<>))

32import Data.Proxy (Proxy (..))

33+import Data.Sequence (fromList)

33import Data.String (fromString)

34import Data.String (fromString)

34import qualified Data.Text as T

35import qualified Data.Text as T

35−import GHC.Exts (fromList)

36import GHC.Generics

37import Network.HTTP.Media (renderHeader)

38import Network.HTTP.Types (hContentType, renderQuery,

servant-server/servant-server.cabal−2

@@ -164,5 +164,3 @@ test-suite doctests

164 if impl(ghc >= 8.2)

165 x-doctest-options: -fdiagnostics-color=never

166 include-dirs: include

167− other-modules:

168− Build_doctests

stack-ghc-7.8.4.yaml+1

@@ -20,6 +20,7 @@ extra-deps:

20- hspec-expectations-0.8.2

21- hspec-wai-0.8.0

22- http-api-data-0.3.6

23+- http-client-0.4.30

23- natural-transformation-0.4

24- natural-transformation-0.4

24- primitive-0.6.1.0

25- primitive-0.6.1.0

25- servant-js-0.9.3

26- servant-js-0.9.3