network-conduit 0.6.2.2 → 1.0.0

raw patch · 3 files changed

+13/−13 lines, 3 filesdep ~conduitPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: conduit

API changes (from Hackage documentation)

Files

• Data/Conduit/Network.hs +3/−3
• Data/Conduit/Network/UDP.hs +8/−8
• network-conduit.cabal +2/−2

@@ -57,7 +57,7 @@ -- This function does /not/ automatically close the socket. -- -- Since 0.0.0-sourceSocket :: MonadIO m => Socket -> GSource m ByteString+sourceSocket :: MonadIO m => Socket -> Producer m ByteString sourceSocket socket =     loop   where@@ -72,11 +72,11 @@ -- This function does /not/ automatically close the socket. -- -- Since 0.0.0-sinkSocket :: MonadIO m => Socket -> GInfSink ByteString m+sinkSocket :: MonadIO m => Socket -> Consumer ByteString m () sinkSocket socket =     loop   where-    loop = awaitE >>= either return (\bs -> lift (liftIO $ sendAll socket bs) >> loop)+    loop = await >>= maybe (return ()) (\bs -> lift (liftIO $ sendAll socket bs) >> loop)  -- | A simple TCP application. --

@@ -37,7 +37,7 @@ -- contains the message payload and the origin address. -- -- This function does /not/ automatically close the socket.-sourceSocket :: MonadIO m => Socket -> Int -> GSource m Message+sourceSocket :: MonadIO m => Socket -> Int -> Producer m Message sourceSocket socket len = loop   where     loop = do@@ -49,7 +49,7 @@ -- The payload is sent using @send@, so some of it might be lost. -- -- This function does /not/ automatically close the socket.-sinkSocket :: MonadIO m => Socket -> GInfSink ByteString m+sinkSocket :: MonadIO m => Socket -> Consumer ByteString m () sinkSocket = sinkSocketHelper (\sock bs -> void $ send sock bs)  -- | Stream messages to the connected socket.@@ -57,7 +57,7 @@ -- The payload is sent using @sendAll@, so it might end up in multiple packets. -- -- This function does /not/ automatically close the socket.-sinkAllSocket :: MonadIO m => Socket -> GInfSink ByteString m+sinkAllSocket :: MonadIO m => Socket -> Consumer ByteString m () sinkAllSocket = sinkSocketHelper sendAll  -- | Stream messages to the socket.@@ -67,7 +67,7 @@ -- lost. -- -- This function does /not/ automatically close the socket.-sinkToSocket :: MonadIO m => Socket -> GInfSink Message m+sinkToSocket :: MonadIO m => Socket -> Consumer Message m () sinkToSocket = sinkSocketHelper (\sock (Message bs addr) -> void $ sendTo sock bs addr)  -- | Stream messages to the socket.@@ -77,7 +77,7 @@ -- multiple packets. -- -- This function does /not/ automatically close the socket.-sinkAllToSocket :: MonadIO m => Socket -> GInfSink Message m+sinkAllToSocket :: MonadIO m => Socket -> Consumer Message m () sinkAllToSocket = sinkSocketHelper (\sock (Message bs addr) -> sendAllTo sock bs addr)  -- | Attempt to connect to the given host/port.@@ -92,10 +92,10 @@ -- Internal sinkSocketHelper :: MonadIO m => (Socket -> a -> IO ())                               -> Socket-                              -> GInfSink a m+                              -> Consumer a m () sinkSocketHelper act socket = loop   where-    loop = awaitE >>= either-                        return+    loop = await >>= maybe+                        (return ())                         (\a -> lift (liftIO $ act socket a) >> loop) {-# INLINE sinkSocketHelper #-}

@@ -1,5 +1,5 @@ Name:                network-conduit-Version:             0.6.2.2+Version:             1.0.0 Synopsis:            Stream socket data using conduits. Description:         Stream socket data using conduits. License:             BSD3@@ -23,7 +23,7 @@   Build-depends:       base                     >= 4            && < 5                      , transformers             >= 0.2.2        && < 0.4                      , bytestring               >= 0.9-                     , conduit                  >= 0.5          && < 0.6+                     , conduit                  >= 1.0          && < 1.1                      , lifted-base              >= 0.1                      , monad-control            >= 0.3          && < 0.4   if flag(network-bytestring)