From a62a827491ca66704d12435047ad0994db40b2ee Mon Sep 17 00:00:00 2001 From: Christian Klinger Date: Tue, 6 Sep 2016 14:06:56 +0200 Subject: [PATCH] fixing HTTP.Client(*) imports. --- servant-client/src/Servant/Common/Req.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/servant-client/src/Servant/Common/Req.hs b/servant-client/src/Servant/Common/Req.hs index a6ec7b0d..1da8c687 100644 --- a/servant-client/src/Servant/Common/Req.hs +++ b/servant-client/src/Servant/Common/Req.hs @@ -22,9 +22,9 @@ import Control.Monad.Error.Class (MonadError(..)) import Control.Monad.Trans.Except #if MIN_VERSION_http_client(0,4,19) -import Network.HTTP.Client ( HasHttpManager ) +import Network.HTTP.Client hiding (Proxy, path) #else -import Network.HTTP.Client.Conduit ( HasHttpManager(getHttpManager) ) +import Network.HTTP.Client.Conduit hiding (Proxy, path) #endif @@ -38,7 +38,6 @@ import Data.Proxy import Data.Text (Text) import Data.Text.Encoding import Data.Typeable -import Network.HTTP.Client hiding (Proxy, path) import Network.HTTP.Media import Network.HTTP.Types import qualified Network.HTTP.Types.Header as HTTP