Consolidate Stream.Concurrent.* modules

src/Streamly/Internal/Data/Stream/Concurrent.hs

@@ -21,26 +21,10 @@ module Streamly.Internal.Data.Stream.Concurrent
     -- * Imports
     -- $setup
 
-    -- * Types
-      MonadAsync
+      module Streamly.Internal.Data.Stream.Concurrent.Channel
 
-    -- * Configuration
-    , Config
-    , maxThreads
-    , maxBuffer
-    , eager
-    , StopWhen (..)
-    , stopWhen
-    , ordered
-    , interleaved
-    -- maxYields
-    , Rate(..)
-    , rate
-    , avgRate
-    , minRate
-    , maxRate
-    , constRate
-    , inspect
+    -- * Types
+    , MonadAsync
 
     -- * Combinators
     -- | Stream combinators using a concurrent channel

src/Streamly/Internal/Data/Stream/Concurrent/Channel.hs

@@ -8,15 +8,18 @@
 
 module Streamly.Internal.Data.Stream.Concurrent.Channel
     (
+      module Streamly.Internal.Data.Stream.Concurrent.Channel.Type
+    , module Streamly.Internal.Data.Stream.Concurrent.Channel.Operations
+    , module Streamly.Internal.Data.Stream.Concurrent.Channel.Append
+    , module Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave
+    , module Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher
+    , module Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer
+
     -- * Channel
-      Channel (..)
+    , Channel (..)
     , newChannel
     , withChannel
     , withChannelK
-    , fromChannel
-    , toChannel
-    , toChannelK
-    , stopChannel
     -- quiesceChannel -- wait for running tasks but do not schedule any more.
 
     -- * Configuration
@@ -52,18 +55,18 @@ where
 
 import Streamly.Internal.Control.Concurrent (MonadAsync)
 import Streamly.Internal.Data.Stream (Stream)
-import Streamly.Internal.Data.Stream.Concurrent.Channel.Operations
-    (fromChannel, fromChannelK, toChannel, toChannelK)
-import Streamly.Internal.Data.Stream.Concurrent.Channel.Append
-    (newAppendChannel)
-import Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave
-    (newInterleaveChannel)
 
 import qualified Streamly.Internal.Data.StreamK as K
 
-import Streamly.Internal.Data.Stream.Concurrent.Channel.Type
 import Streamly.Internal.Data.Channel.Types
 
+import Streamly.Internal.Data.Stream.Concurrent.Channel.Type
+import Streamly.Internal.Data.Stream.Concurrent.Channel.Operations
+import Streamly.Internal.Data.Stream.Concurrent.Channel.Append
+import Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave
+import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher
+import Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer
+
 -- | Create a new concurrent stream evaluation channel. The monad
 -- state used to run the stream actions is captured from the call site of
 -- newChannel.

streamly.cabal

@@ -375,13 +375,6 @@ library
                      , Streamly.Internal.Data.Unfold.Prelude
                      , Streamly.Internal.Data.Fold.Prelude
 
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel.Type
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel.Append
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel.Operations
-                     , Streamly.Internal.Data.Stream.Concurrent.Channel
                      , Streamly.Internal.Data.Stream.Concurrent
                      , Streamly.Internal.Data.Stream.Zip.Concurrent
                      , Streamly.Internal.Data.Stream.Time
@@ -457,7 +450,14 @@ library
          , Streamly.Data.Stream.Concurrent
          , Streamly.Data.Stream.Time
 
-         , Streamly.Internal.Data.Fold.SVar
+         , Streamly.Internal.Data.Stream.Concurrent.Channel.Type
+         , Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher
+         , Streamly.Internal.Data.Stream.Concurrent.Channel.Consumer
+         , Streamly.Internal.Data.Stream.Concurrent.Channel.Append
+         , Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave
+         , Streamly.Internal.Data.Stream.Concurrent.Channel.Operations
+         , Streamly.Internal.Data.Stream.Concurrent.Channel
+
          , Streamly.Internal.Data.Fold.Async
          , Streamly.Internal.Data.Fold.Concurrent.Channel.Type
          , Streamly.Internal.Data.Fold.Concurrent.Channel
@@ -466,6 +466,7 @@ library
          , Streamly.Internal.Data.Unfold.Exception
          , Streamly.Internal.Data.Unfold.SVar
 
+         -- Deprecated
          , Streamly.Internal.Data.Stream.Common
          , Streamly.Internal.Data.Stream.IsStream.Type
          , Streamly.Internal.Data.Stream.IsStream.Generate
@@ -483,6 +484,8 @@ library
          , Streamly.Internal.Data.Stream.SVar.Generate
          , Streamly.Internal.Data.Stream.SVar.Eliminate
 
+         , Streamly.Internal.Data.Fold.SVar
+
          , Streamly.Internal.Data.SVar.Worker
          , Streamly.Internal.Data.SVar.Dispatch
          , Streamly.Internal.Data.SVar.Pull