Compiles with pre-release conduit

snoyberg · snoyberg · commit 5cc5efa3a4f7 · 2017-12-31T09:30:32.000+02:00
diff --git a/src/Network/HTTP/StackClient.hs b/src/Network/HTTP/StackClient.hs
@@ -15,16 +15,15 @@ module Network.HTTP.StackClient
   , withResponseByManager
   ) where
 
-import           Control.Monad.Catch (MonadMask)
 import           Data.Aeson (FromJSON)
 import qualified Data.ByteString as Strict
 import           Data.ByteString.Lazy (ByteString)
-import           Data.Conduit (ConduitM, Sink)
+import           Data.Conduit (ConduitM, Sink, transPipe)
 import qualified Network.HTTP.Client
 import           Network.HTTP.Client (BodyReader, Manager, Request, Response)
 import           Network.HTTP.Simple (setRequestHeader)
 import qualified Network.HTTP.Simple
-import           UnliftIO (MonadIO)
+import           UnliftIO (MonadIO, MonadUnliftIO, withRunInIO, withUnliftIO, unliftIO)
 
 
 setUserAgent :: Request -> Request
@@ -47,15 +46,18 @@ httpNoBody :: MonadIO m => Request -> m (Response ())
 httpNoBody = Network.HTTP.Simple.httpNoBody . setUserAgent
 
 
-httpSink :: (MonadIO m, MonadMask m) => Request -> (Response () -> Sink Strict.ByteString m a) -> m a
-httpSink = Network.HTTP.Simple.httpSink . setUserAgent
+httpSink :: MonadUnliftIO m => Request -> (Response () -> Sink Strict.ByteString m a) -> m a
+httpSink req inner = withUnliftIO $ \u ->
+  Network.HTTP.Simple.httpSink (setUserAgent req) (transPipe (unliftIO u) . inner)
 
 
 withResponse
-  :: (MonadIO m, MonadMask m, MonadIO n)
+  :: (MonadUnliftIO m, MonadIO n)
   => Request -> (Response (ConduitM i Strict.ByteString n ()) -> m a) -> m a
-withResponse = Network.HTTP.Simple.withResponse . setUserAgent
+withResponse req inner = withRunInIO $ \run ->
+  Network.HTTP.Simple.withResponse (setUserAgent req) (run . inner)
 
 
-withResponseByManager :: Request -> Manager -> (Response BodyReader -> IO a) -> IO a
-withResponseByManager = Network.HTTP.Client.withResponse . setUserAgent
+withResponseByManager :: MonadUnliftIO m => Request -> Manager -> (Response BodyReader -> m a) -> m a
+withResponseByManager req man inner = withRunInIO $ \run ->
+  Network.HTTP.Client.withResponse (setUserAgent req) man (run . inner)
