stm-conduit 2.6.1 → 2.7.0

raw patch · 6 files changed

+50/−33 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

- Data.Conduit.Utils: instance BoundedStream (Proxy2 TBMChan) TBMChan

- Data.Conduit.Utils: instance BoundedStream (Proxy2 TBMQueue) TBMQueue

- Data.Conduit.Utils: instance BoundedStream (Proxy2 TBQueue) TBQueue

- Data.Conduit.Utils: instance MonadIO m => IsConduit m TBMChan

- Data.Conduit.Utils: instance MonadIO m => IsConduit m TBMQueue

- Data.Conduit.Utils: instance MonadIO m => IsConduit m TBQueue

- Data.Conduit.Utils: instance MonadIO m => IsConduit m TMChan

- Data.Conduit.Utils: instance MonadIO m => IsConduit m TMQueue

- Data.Conduit.Utils: instance MonadIO m => IsConduit m TQueue

- Data.Conduit.Utils: instance UnboundedStream (Proxy2 TMChan) TMChan

- Data.Conduit.Utils: instance UnboundedStream (Proxy2 TMQueue) TMQueue

- Data.Conduit.Utils: instance UnboundedStream (Proxy2 TQueue) TQueue

+ Data.Conduit.Utils: instance Control.Monad.IO.Class.MonadIO m => Data.Conduit.Utils.IsConduit m Control.Concurrent.STM.TBMChan.TBMChan

+ Data.Conduit.Utils: instance Control.Monad.IO.Class.MonadIO m => Data.Conduit.Utils.IsConduit m Control.Concurrent.STM.TBMQueue.TBMQueue

+ Data.Conduit.Utils: instance Control.Monad.IO.Class.MonadIO m => Data.Conduit.Utils.IsConduit m Control.Concurrent.STM.TBQueue.TBQueue

+ Data.Conduit.Utils: instance Control.Monad.IO.Class.MonadIO m => Data.Conduit.Utils.IsConduit m Control.Concurrent.STM.TMChan.TMChan

+ Data.Conduit.Utils: instance Control.Monad.IO.Class.MonadIO m => Data.Conduit.Utils.IsConduit m Control.Concurrent.STM.TMQueue.TMQueue

+ Data.Conduit.Utils: instance Control.Monad.IO.Class.MonadIO m => Data.Conduit.Utils.IsConduit m Control.Concurrent.STM.TQueue.TQueue

+ Data.Conduit.Utils: instance Data.Conduit.Utils.BoundedStream (Data.Conduit.Utils.Proxy2 Control.Concurrent.STM.TBMChan.TBMChan) Control.Concurrent.STM.TBMChan.TBMChan

+ Data.Conduit.Utils: instance Data.Conduit.Utils.BoundedStream (Data.Conduit.Utils.Proxy2 Control.Concurrent.STM.TBMQueue.TBMQueue) Control.Concurrent.STM.TBMQueue.TBMQueue

+ Data.Conduit.Utils: instance Data.Conduit.Utils.BoundedStream (Data.Conduit.Utils.Proxy2 Control.Concurrent.STM.TBQueue.TBQueue) Control.Concurrent.STM.TBQueue.TBQueue

+ Data.Conduit.Utils: instance Data.Conduit.Utils.UnboundedStream (Data.Conduit.Utils.Proxy2 Control.Concurrent.STM.TMChan.TMChan) Control.Concurrent.STM.TMChan.TMChan

+ Data.Conduit.Utils: instance Data.Conduit.Utils.UnboundedStream (Data.Conduit.Utils.Proxy2 Control.Concurrent.STM.TMQueue.TMQueue) Control.Concurrent.STM.TMQueue.TMQueue

+ Data.Conduit.Utils: instance Data.Conduit.Utils.UnboundedStream (Data.Conduit.Utils.Proxy2 Control.Concurrent.STM.TQueue.TQueue) Control.Concurrent.STM.TQueue.TQueue

- Data.Conduit.Async: ($=&) :: CCatable c1 c2 c3 => c1 i x m () -> c2 x o m r -> c3 i o m r

+ Data.Conduit.Async: ($=&) :: (CCatable c1 c2 c3) => c1 i x m () -> c2 x o m r -> c3 i o m r

- Data.Conduit.Async: (=$&) :: CCatable c1 c2 c3 => c1 i x m () -> c2 x o m r -> c3 i o m r

+ Data.Conduit.Async: (=$&) :: (CCatable c1 c2 c3) => c1 i x m () -> c2 x o m r -> c3 i o m r

- Data.Conduit.Async: (=$=&) :: CCatable c1 c2 c3 => c1 i x m () -> c2 x o m r -> c3 i o m r

+ Data.Conduit.Async: (=$=&) :: (CCatable c1 c2 c3) => c1 i x m () -> c2 x o m r -> c3 i o m r

Files

Data/Conduit/Async.hs +14/−10
Data/Conduit/Async/Composition.hs +6/−2
Data/Conduit/TMChan.hs +9/−2
stm-conduit.cabal +7/−6
test/DocTest.hs +0/−13
test/DocTests.hs +14/−0

Data/Conduit/Async.hs view

@@ -1,4 +1,6 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE PackageImports #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE RecordWildCards #-}@@ -13,17 +15,19 @@                           , drainTo                           ) where -import           Control.Applicative-import           Control.Concurrent.Async.Lifted-import           Control.Concurrent.STM-import           Control.Exception.Lifted-import           Control.Monad.IO.Class-import           Control.Monad.Loops-import           Control.Monad.Trans.Class-import           Control.Monad.Trans.Control-import           Data.Conduit+#if __GLASGOW_HASKELL__ < 710+import Control.Applicative+#endif+import Control.Concurrent.Async.Lifted+import Control.Concurrent.STM+import Control.Exception.Lifted+import Control.Monad.IO.Class+import Control.Monad.Loops+import Control.Monad.Trans.Class+import Control.Monad.Trans.Control+import Data.Conduit -import           Data.Conduit.Async.Composition+import Data.Conduit.Async.Composition  -- | Gather output values asynchronously from an action in the base monad and --   then yield them downstream.  This provides a means of working around the

Data/Conduit/Async/Composition.hs view

@@ -1,9 +1,11 @@ {-# LANGUAGE ConstraintKinds #-}+{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FunctionalDependencies #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE KindSignatures #-} {-# LANGUAGE MultiParamTypeClasses #-}+{-# LANGUAGE PackageImports #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-}@@ -22,9 +24,11 @@                                       , runCConduit                                       ) where +#if __GLASGOW_HASKELL__ < 710+import           Control.Applicative+#endif import Conduit-import Control.Applicative-import qualified Control.Concurrent.Async as A+import qualified "async" Control.Concurrent.Async as A import Control.Concurrent.Async.Lifted hiding (link2) import Control.Concurrent.STM import Control.Exception (finally)

Data/Conduit/TMChan.hs view

@@ -1,4 +1,9 @@-{-# LANGUAGE NoMonomorphismRestriction, FlexibleContexts, RankNTypes,KindSignatures #-}+{-# LANGUAGE CPP #-}+{-# LANGUAGE NoMonomorphismRestriction #-}+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE RankNTypes #-}+{-# LANGUAGE KindSignatures #-}+ -- | * Introduction -- --   Contains a simple source and sink for linking together conduits in@@ -53,7 +58,9 @@                            , mergeConduits                            ) where -import Control.Applicative+#if __GLASGOW_HASKELL__ < 710+import           Control.Applicative+#endif import Control.Monad import Control.Monad.IO.Class ( liftIO, MonadIO ) import Control.Monad.Trans.Class

stm-conduit.cabal view

@@ -1,9 +1,7 @@ Name:                stm-conduit-Version:             2.6.1-Synopsis:            Introduces conduits to channels, and promotes using-                     conduits concurrently.-Description:         Provides two simple conduit wrappers around STM-                     channels - a source and a sink.+Version:             2.7.0+Synopsis:            Introduces conduits to channels, and promotes using conduits concurrently.+Description:         Provides two simple conduit wrappers around STM channels - a source and a sink. Homepage:            https://github.com/wowus/stm-conduit License:             BSD3 License-file:        LICENSE@@ -13,6 +11,9 @@  Build-type:          Simple +tested-with: GHC >= 7.6 && < 7.11+-- selects GHC 7.4.1, 7.4.2, 7.6.1, 7.6.2, and 7.6.3+ Cabal-version:       >=1.8  Library@@ -49,7 +50,7 @@  test-suite stm-conduit-doctests     type:           exitcode-stdio-1.0-    main-is:        DocTest.hs+    main-is:        DocTests.hs     ghc-options:    -threaded     hs-source-dirs: test/                     ./

− test/DocTest.hs

@@ -1,13 +0,0 @@-module Main where--import Test.DocTest--main :: IO ()-main = doctest [-  "-packageghc"-  , "-isrc"-  , "-idist/build/autogen/"-  , "-optP-include"-  , "-optPdist/build/autogen/cabal_macros.h"-  , "Data/Conduit/Async/Composition.hs"-  ]

+ test/DocTests.hs view

@@ -0,0 +1,14 @@+module Main where++import Test.DocTest++main :: IO ()+main = doctest [+  "-packageghc"+  , "-isrc"+  , "-idist/build/autogen/"+  , "-optP-include"+  , "-optPdist/build/autogen/cabal_macros.h"+  , "-cpp"+  , "Data/Conduit/Async/Composition.hs"+  ]