diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 3b8e521e..c49cfe0e 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -53,7 +53,6 @@ library , text >= 1.2 && < 1.3 , transformers >= 0.3 && < 0.6 , transformers-compat >= 0.4 && < 0.6 - , http-conduit , mtl hs-source-dirs: src default-language: Haskell2010 diff --git a/servant-client/src/Servant/Common/Req.hs b/servant-client/src/Servant/Common/Req.hs index 1da8c687..7a8d7a1e 100644 --- a/servant-client/src/Servant/Common/Req.hs +++ b/servant-client/src/Servant/Common/Req.hs @@ -21,12 +21,6 @@ import Control.Monad.Error.Class (MonadError(..)) #endif import Control.Monad.Trans.Except -#if MIN_VERSION_http_client(0,4,19) -import Network.HTTP.Client hiding (Proxy, path) -#else -import Network.HTTP.Client.Conduit hiding (Proxy, path) -#endif - import GHC.Generics import Control.Monad.IO.Class () @@ -40,6 +34,7 @@ import Data.Text.Encoding import Data.Typeable import Network.HTTP.Media import Network.HTTP.Types +import Network.HTTP.Client hiding (Proxy, path) import qualified Network.HTTP.Types.Header as HTTP import Network.URI hiding (path) import Servant.API.ContentTypes @@ -173,8 +168,6 @@ data ClientEnv , baseUrl :: BaseUrl } -instance HasHttpManager ClientEnv where - getHttpManager = manager -- | @ClientM@ is the monad in which client functions run. Contains the -- 'Manager' and 'BaseUrl' used for requests in the reader environment.