eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove HasHttpManager instance and http-conduit dependency.

Browse source
This commit is contained in:
Christian Klinger 2016-09-07 10:59:34 +02:00
parent a62a827491
commit 1ceecff28f
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servant-client/servant-client.cabal
View file

@ -53,7 +53,6 @@ library
, text >= 1.2 && < 1.3 , text >= 1.2 && < 1.3
, transformers >= 0.3 && < 0.6 , transformers >= 0.3 && < 0.6
, transformers-compat >= 0.4 && < 0.6 , transformers-compat >= 0.4 && < 0.6
, http-conduit
, mtl , mtl
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010

9
servant-client/src/Servant/Common/Req.hs
View file

@ -21,12 +21,6 @@ import Control.Monad.Error.Class (MonadError(..))
#endif #endif
import Control.Monad.Trans.Except 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 GHC.Generics
import Control.Monad.IO.Class () import Control.Monad.IO.Class ()
@ -40,6 +34,7 @@ import Data.Text.Encoding
import Data.Typeable import Data.Typeable
import Network.HTTP.Media import Network.HTTP.Media
import Network.HTTP.Types import Network.HTTP.Types
import Network.HTTP.Client hiding (Proxy, path)
import qualified Network.HTTP.Types.Header as HTTP import qualified Network.HTTP.Types.Header as HTTP
import Network.URI hiding (path) import Network.URI hiding (path)
import Servant.API.ContentTypes import Servant.API.ContentTypes
@ -173,8 +168,6 @@ data ClientEnv
, baseUrl :: BaseUrl , baseUrl :: BaseUrl
} }
instance HasHttpManager ClientEnv where
getHttpManager = manager
-- | @ClientM@ is the monad in which client functions run. Contains the -- | @ClientM@ is the monad in which client functions run. Contains the
-- 'Manager' and 'BaseUrl' used for requests in the reader environment. -- 'Manager' and 'BaseUrl' used for requests in the reader environment.