on master help sign in
Hide Internal StreamD submodules
d304fb8Ranjeet Kumar Ranjan
benchmark/Streamly/Benchmark/Data/Array/Stream.hs+1−1
@@ -54,7 +54,7 @@ import Control.Monad.IO.Class (MonadIO)
54
54
55#ifdef INSPECTION
55#ifdef INSPECTION
56import Streamly.Internal.Data.Unbox (Unbox)
56import Streamly.Internal.Data.Unbox (Unbox)
57−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
57+import Streamly.Internal.Data.Stream (Step(..))
58import Test.Inspection
58import Test.Inspection
59#endif
59#endif
60
60
benchmark/Streamly/Benchmark/Data/Stream/Split.hs+1−1
@@ -41,7 +41,7 @@ import Streamly.Benchmark.Common
41import Streamly.Benchmark.Common.Handle
41import Streamly.Benchmark.Common.Handle
42
42
43#ifdef INSPECTION
43#ifdef INSPECTION
44−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
44+import Streamly.Internal.Data.Stream (Step(..))
45
45
46import qualified Streamly.Internal.Data.MutArray.Type as MA
46import qualified Streamly.Internal.Data.MutArray.Type as MA
47import qualified Streamly.Internal.Data.Unfold as IUF
47import qualified Streamly.Internal.Data.Unfold as IUF
benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+1−1
@@ -46,7 +46,7 @@ import Prelude hiding (last, length)
46import Streamly.Benchmark.Common.Handle
46import Streamly.Benchmark.Common.Handle
47
47
48#ifdef INSPECTION
48#ifdef INSPECTION
49−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)
49+import Streamly.Internal.Data.Stream (Step(..), FoldMany)
50
50
51import qualified Streamly.Internal.Data.MutArray.Type as MA
51import qualified Streamly.Internal.Data.MutArray.Type as MA
52import qualified Streamly.Internal.Data.Stream as D
52import qualified Streamly.Internal.Data.Stream as D
benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+2−2
@@ -38,9 +38,9 @@ import Gauge hiding (env)
38import Streamly.Benchmark.Common.Handle
38import Streamly.Benchmark.Common.Handle
39
39
40#ifdef INSPECTION
40#ifdef INSPECTION
41−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
41+import Streamly.Internal.Data.Stream (Step(..))
42
42
43−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
43+import qualified Streamly.Internal.Data.Stream as D
44import qualified Streamly.Internal.Data.Tuple.Strict as Strict
44import qualified Streamly.Internal.Data.Tuple.Strict as Strict
45import qualified Streamly.Internal.Data.Stream.MutChunked as MAS
45import qualified Streamly.Internal.Data.Stream.MutChunked as MAS
46import qualified Streamly.Internal.Data.Array.Type as AT
46import qualified Streamly.Internal.Data.Array.Type as AT
benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1
@@ -39,7 +39,7 @@ import Streamly.Benchmark.Common.Handle
39
39
40#ifdef INSPECTION
40#ifdef INSPECTION
41import Streamly.Internal.Data.Unbox (Unbox)
41import Streamly.Internal.Data.Unbox (Unbox)
42−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
42+import Streamly.Internal.Data.Stream.StreamD (Step(..))
43import qualified Streamly.Internal.Data.Fold.Type as Fold
43import qualified Streamly.Internal.Data.Fold.Type as Fold
44import qualified Streamly.Internal.Data.Tuple.Strict as Strict
44import qualified Streamly.Internal.Data.Tuple.Strict as Strict
45import qualified Streamly.Internal.Data.Array.Type as Array
45import qualified Streamly.Internal.Data.Array.Type as Array
core/src/Streamly/Internal/FileSystem/Handle.hs+1−1
@@ -137,7 +137,7 @@ import qualified Streamly.Internal.Data.MutArray.Type as MArray
137import qualified Streamly.Internal.Data.Refold.Type as Refold
137import qualified Streamly.Internal.Data.Refold.Type as Refold
138import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)
138import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)
139import qualified Streamly.Internal.Data.Stream as S
139import qualified Streamly.Internal.Data.Stream as S
140−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
140+import qualified Streamly.Internal.Data.Stream as D
141 (Stream(..), Step(..))
141 (Stream(..), Step(..))
142import qualified Streamly.Internal.Data.Unfold as UF
142import qualified Streamly.Internal.Data.Unfold as UF
143import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)
143import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)
core/streamly-core.cabal+15−13
@@ -290,8 +290,6 @@ library
290 , Streamly.Internal.Data.Fold.Step
290 , Streamly.Internal.Data.Fold.Step
291 , Streamly.Internal.Data.Refold.Type
291 , Streamly.Internal.Data.Refold.Type
292 , Streamly.Internal.Data.Fold.Type
292 , Streamly.Internal.Data.Fold.Type
293− , Streamly.Internal.Data.Stream.StreamD.Step
294− , Streamly.Internal.Data.Stream.StreamD.Type
295 , Streamly.Internal.Data.Unfold.Type
293 , Streamly.Internal.Data.Unfold.Type
296 , Streamly.Internal.Data.Producer.Type
294 , Streamly.Internal.Data.Producer.Type
297 , Streamly.Internal.Data.Producer
295 , Streamly.Internal.Data.Producer
@@ -316,13 +314,6 @@ library
316 -- streamly-core-streams
314 -- streamly-core-streams
317 , Streamly.Internal.Data.StreamK
315 , Streamly.Internal.Data.StreamK
318 -- StreamD depends on streamly-array-types
316 -- StreamD depends on streamly-array-types
319− , Streamly.Internal.Data.Stream.StreamD.Generate
320− , Streamly.Internal.Data.Stream.StreamD.Eliminate
321− , Streamly.Internal.Data.Stream.StreamD.Nesting
322− , Streamly.Internal.Data.Stream.StreamD.Transform
323− , Streamly.Internal.Data.Stream.StreamD.Exception
324− , Streamly.Internal.Data.Stream.StreamD.Lift
325− , Streamly.Internal.Data.Stream.StreamD.Top
326 , Streamly.Internal.Data.Stream.StreamD
317 , Streamly.Internal.Data.Stream.StreamD
327 , Streamly.Internal.Data.Stream.Common
318 , Streamly.Internal.Data.Stream.Common
328 , Streamly.Internal.Data.Stream
319 , Streamly.Internal.Data.Stream
@@ -332,7 +323,6 @@ library
332 -- streamly-core-data
323 -- streamly-core-data
333 , Streamly.Internal.Data.Builder
324 , Streamly.Internal.Data.Builder
334 , Streamly.Internal.Data.Unfold
325 , Streamly.Internal.Data.Unfold
335− , Streamly.Internal.Data.Unfold.Enumeration
336 , Streamly.Internal.Data.Fold.Tee
326 , Streamly.Internal.Data.Fold.Tee
337 , Streamly.Internal.Data.Fold
327 , Streamly.Internal.Data.Fold
338 , Streamly.Internal.Data.Fold.Chunked
328 , Streamly.Internal.Data.Fold.Chunked
@@ -341,13 +331,11 @@ library
341 , Streamly.Internal.Data.Pipe
331 , Streamly.Internal.Data.Pipe
342
332
343 -- streamly-transformers (non-base)
333 -- streamly-transformers (non-base)
344− , Streamly.Internal.Data.Stream.StreamD.Transformer
345 , Streamly.Internal.Data.Stream.StreamK.Transformer
334 , Streamly.Internal.Data.Stream.StreamK.Transformer
346
335
347 -- streamly-containers (non-base)
336 -- streamly-containers (non-base)
348− , Streamly.Internal.Data.Stream.StreamD.Container
349− , Streamly.Internal.Data.Fold.Container
350
337
338+ , Streamly.Internal.Data.Fold.Container
351 , Streamly.Internal.Data.Stream.Chunked
339 , Streamly.Internal.Data.Stream.Chunked
352
340
353 -- streamly-core-data-arrays
341 -- streamly-core-data-arrays
@@ -420,6 +408,20 @@ library
420 , Streamly.Unicode.Parser
408 , Streamly.Unicode.Parser
421 , Streamly.Unicode.Stream
409 , Streamly.Unicode.Stream
422 , Streamly.Unicode.String
410 , Streamly.Unicode.String
411+ other-modules:
412+ Streamly.Internal.Data.Stream.StreamD.Container
413+ , Streamly.Internal.Data.Stream.StreamD.Eliminate
414+ , Streamly.Internal.Data.Stream.StreamD.Exception
415+ , Streamly.Internal.Data.Stream.StreamD.Generate
416+ , Streamly.Internal.Data.Stream.StreamD.Lift
417+ , Streamly.Internal.Data.Stream.StreamD.Nesting
418+ , Streamly.Internal.Data.Stream.StreamD.Step
419+ , Streamly.Internal.Data.Stream.StreamD.Top
420+ , Streamly.Internal.Data.Stream.StreamD.Transform
421+ , Streamly.Internal.Data.Stream.StreamD.Transformer
422+ , Streamly.Internal.Data.Stream.StreamD.Type
423+
424+ , Streamly.Internal.Data.Unfold.Enumeration
423
425
424 if flag(dev)
426 if flag(dev)
425 exposed-modules:
427 exposed-modules:
src/Streamly/Internal/Data/Fold/Concurrent/Channel/Type.hs+1−1
@@ -34,7 +34,7 @@ import Streamly.Internal.Data.Stream.Channel.Dispatcher (dumpSVarStats)
34import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)
34import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)
35
35
36import qualified Streamly.Internal.Data.Fold as Fold
36import qualified Streamly.Internal.Data.Fold as Fold
37−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
37+import qualified Streamly.Internal.Data.Stream as D
38
38
39import Streamly.Internal.Data.Stream.Channel.Types
39import Streamly.Internal.Data.Stream.Channel.Types
40
40
src/Streamly/Internal/Data/Stream/Ahead.hs+1−1
@@ -59,7 +59,7 @@ import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
59import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
59import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
60 (foldStreamShared, cons, mkStream, foldStream, fromEffect
60 (foldStreamShared, cons, mkStream, foldStream, fromEffect
61 , nil, concatMapWith, fromPure, bindWith)
61 , nil, concatMapWith, fromPure, bindWith)
62−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
62+import qualified Streamly.Internal.Data.Stream as D
63 (mapM, fromStreamK, toStreamK)
63 (mapM, fromStreamK, toStreamK)
64import qualified Streamly.Internal.Data.Stream.Serial as Stream (toStreamK)
64import qualified Streamly.Internal.Data.Stream.Serial as Stream (toStreamK)
65
65
src/Streamly/Internal/Data/Stream/Async.hs+1−1
@@ -70,7 +70,7 @@ import Streamly.Internal.Data.Stream.SVar.Generate (fromSVar, fromSVarD)
70import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
70import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
71 (foldStreamShared, mkStream, foldStream, fromEffect
71 (foldStreamShared, mkStream, foldStream, fromEffect
72 , nil, concatMapWith, fromPure, bindWith)
72 , nil, concatMapWith, fromPure, bindWith)
73−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
73+import qualified Streamly.Internal.Data.Stream as D
74 (Stream(..), Step(..), mapM, toStreamK, fromStreamK)
74 (Stream(..), Step(..), mapM, toStreamK, fromStreamK)
75import qualified Streamly.Internal.Data.Stream.Serial as Stream (toStreamK)
75import qualified Streamly.Internal.Data.Stream.Serial as Stream (toStreamK)
76
76
src/Streamly/Internal/Data/Stream/Concurrent.hs+1−1
@@ -110,7 +110,7 @@ import Streamly.Internal.Data.Stream.Channel.Types
110 , concatMapDivK
110 , concatMapDivK
111 )
111 )
112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)
112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)
113−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
113+import Streamly.Internal.Data.Stream (Stream)
114import Streamly.Internal.Data.Stream (Step(..))
114import Streamly.Internal.Data.Stream (Step(..))
115
115
116import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed
116import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed
src/Streamly/Internal/Data/Stream/Concurrent/Channel/Operations.hs+2−2
@@ -34,12 +34,12 @@ import Data.IORef (newIORef, readIORef, mkWeakIORef, writeIORef)
34import Data.Maybe (isNothing)
34import Data.Maybe (isNothing)
35import Streamly.Internal.Control.Concurrent
35import Streamly.Internal.Control.Concurrent
36 (MonadAsync, MonadRunInIO, askRunInIO)
36 (MonadAsync, MonadRunInIO, askRunInIO)
37−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
37+import Streamly.Internal.Data.Stream (Stream)
38import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
38import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
39import System.Mem (performMajorGC)
39import System.Mem (performMajorGC)
40
40
41import qualified Streamly.Internal.Data.Stream as Stream
41import qualified Streamly.Internal.Data.Stream as Stream
42−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
42+import qualified Streamly.Internal.Data.Stream as D
43import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
43import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
44
44
45import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher
45import Streamly.Internal.Data.Stream.Concurrent.Channel.Dispatcher
src/Streamly/Internal/Data/Stream/Exception/Lifted.hs+1−1
@@ -35,7 +35,7 @@ import Data.Map.Strict (Map)
35import GHC.Exts (inline)
35import GHC.Exts (inline)
36import Streamly.Internal.Control.Concurrent
36import Streamly.Internal.Control.Concurrent
37 (MonadRunInIO, MonadAsync, withRunInIO)
37 (MonadRunInIO, MonadAsync, withRunInIO)
38−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
38+import Streamly.Internal.Data.Stream (Stream)
39import Streamly.Internal.Data.IOFinalizer.Lifted
39import Streamly.Internal.Data.IOFinalizer.Lifted
40 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
40 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
41import Streamly.Internal.Data.Stream (Step(..))
41import Streamly.Internal.Data.Stream (Step(..))
src/Streamly/Internal/Data/Stream/IsStream/Exception.hs+1−1
@@ -32,7 +32,7 @@ import Streamly.Internal.Control.Concurrent (MonadRunInIO, MonadAsync)
32import Streamly.Internal.Data.Stream.IsStream.Type
32import Streamly.Internal.Data.Stream.IsStream.Type
33 (IsStream(..), fromStreamD, toStreamD)
33 (IsStream(..), fromStreamD, toStreamD)
34
34
35−import qualified Streamly.Internal.Data.Stream.StreamD.Exception as D
35+import qualified Streamly.Internal.Data.Stream as D
36 ( before
36 ( before
37 , afterUnsafe
37 , afterUnsafe
38 , onException
38 , onException
src/Streamly/Internal/Data/Stream/IsStream/Type.hs+1−1
@@ -119,7 +119,7 @@ import qualified Streamly.Internal.Data.Stream.Ahead as Ahead
119import qualified Streamly.Internal.Data.Stream.Async as Async
119import qualified Streamly.Internal.Data.Stream.Async as Async
120import qualified Streamly.Internal.Data.Stream.Parallel as Parallel
120import qualified Streamly.Internal.Data.Stream.Parallel as Parallel
121import qualified Streamly.Internal.Data.Stream.Serial as Serial
121import qualified Streamly.Internal.Data.Stream.Serial as Serial
122−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
122+import qualified Streamly.Internal.Data.Stream as D
123 (Stream(..), toStreamK, fromStreamK
123 (Stream(..), toStreamK, fromStreamK
124 , drain, eqBy, cmpBy, fromList, toList, foldrMx, foldlMx'
124 , drain, eqBy, cmpBy, fromList, toList, foldrMx, foldlMx'
125 , foldlx', foldl', fold)
125 , foldlx', foldl', fold)
src/Streamly/Internal/Data/Stream/Parallel.hs+2−2
@@ -66,13 +66,13 @@ import Data.Maybe (fromJust)
66
66
67import Streamly.Data.Fold (Fold)
67import Streamly.Data.Fold (Fold)
68import Streamly.Internal.Control.Concurrent (MonadAsync)
68import Streamly.Internal.Control.Concurrent (MonadAsync)
69−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
69+import Streamly.Internal.Data.Stream (Step(..))
70
70
71import qualified Data.Set as Set
71import qualified Data.Set as Set
72import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
72import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
73 (StreamK, foldStreamShared, mkStream, foldStream, fromEffect
73 (StreamK, foldStreamShared, mkStream, foldStream, fromEffect
74 , nil, concatMapWith, fromPure, bindWith)
74 , nil, concatMapWith, fromPure, bindWith)
75−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
75+import qualified Streamly.Internal.Data.Stream as D
76 (Stream(..), mapM, toStreamK, fromStreamK)
76 (Stream(..), mapM, toStreamK, fromStreamK)
77import qualified Streamly.Internal.Data.Stream.SVar.Generate as SVar
77import qualified Streamly.Internal.Data.Stream.SVar.Generate as SVar
78import qualified Streamly.Internal.Data.Stream.SVar.Eliminate as SVar
78import qualified Streamly.Internal.Data.Stream.SVar.Eliminate as SVar
src/Streamly/Internal/Data/Stream/SVar/Eliminate.hs+1−1
@@ -40,7 +40,7 @@ import Streamly.Internal.Data.Fold.Type (Fold(..))
40import Streamly.Internal.Data.Stream.Serial (SerialT)
40import Streamly.Internal.Data.Stream.Serial (SerialT)
41import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
41import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
42
42
43−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
43+import qualified Streamly.Internal.Data.Stream as D
44 (Stream(..), Step(..), fold)
44 (Stream(..), Step(..), fold)
45import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
45import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
46 (Stream, mkStream, foldStream, foldStreamShared, nilM)
46 (Stream, mkStream, foldStream, foldStreamShared, nilM)
src/Streamly/Internal/Data/Stream/SVar/Generate.hs+1−1
@@ -43,7 +43,7 @@ import Streamly.Internal.Data.Stream.Serial (SerialT)
43import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
43import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
44import System.Mem (performMajorGC)
44import System.Mem (performMajorGC)
45
45
46−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
46+import qualified Streamly.Internal.Data.Stream as D
47 (Stream(..), Step(..))
47 (Stream(..), Step(..))
48import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
48import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
49 (Stream, foldStreamShared, mkStream, foldStream)
49 (Stream, foldStreamShared, mkStream, foldStream)
src/Streamly/Internal/Data/Stream/Serial.hs+1−3
@@ -73,9 +73,7 @@ import Streamly.Internal.Data.Maybe.Strict (Maybe'(..), toMaybe)
73import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
73import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
74
74
75import qualified Streamly.Internal.Data.Stream.Common as P
75import qualified Streamly.Internal.Data.Stream.Common as P
76−import qualified Streamly.Internal.Data.Stream.StreamD.Generate as D
76+import qualified Streamly.Internal.Data.Stream as D
77−import qualified Streamly.Internal.Data.Stream.StreamD.Transform as D
78−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
79import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
77import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
80
78
81import Prelude hiding (map, mapM, repeat, filter)
79import Prelude hiding (map, mapM, repeat, filter)
src/Streamly/Internal/Data/Stream/Time.hs+1−1
@@ -62,7 +62,7 @@ import Data.Proxy (Proxy(..))
62import Streamly.Data.Fold (Fold)
62import Streamly.Data.Fold (Fold)
63import Streamly.Internal.Data.Fold.Type (Fold (..))
63import Streamly.Internal.Data.Fold.Type (Fold (..))
64import Streamly.Internal.Data.IsMap (IsMap(..))
64import Streamly.Internal.Data.IsMap (IsMap(..))
65−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
65+import Streamly.Internal.Data.Stream (Stream)
66import Streamly.Internal.Data.Time.Units
66import Streamly.Internal.Data.Time.Units
67 ( AbsTime
67 ( AbsTime
68 , MilliSecond64(..)
68 , MilliSecond64(..)
src/Streamly/Internal/Data/Unfold/Exception.hs+1−1
@@ -25,7 +25,7 @@ import Streamly.Internal.Control.Concurrent
25 (MonadRunInIO, MonadAsync, withRunInIO)
25 (MonadRunInIO, MonadAsync, withRunInIO)
26import Streamly.Internal.Data.IOFinalizer.Lifted
26import Streamly.Internal.Data.IOFinalizer.Lifted
27 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
27 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
28−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
28+import Streamly.Internal.Data.Stream (Step(..))
29
29
30import qualified Control.Monad.Catch as MC
30import qualified Control.Monad.Catch as MC
31
31
src/Streamly/Internal/Data/Unfold/SVar.hs+1−1
@@ -21,7 +21,7 @@ import Control.Monad.IO.Class (MonadIO(..))
21import Data.IORef (newIORef, readIORef, mkWeakIORef, writeIORef)
21import Data.IORef (newIORef, readIORef, mkWeakIORef, writeIORef)
22import Data.Maybe (isNothing)
22import Data.Maybe (isNothing)
23import Streamly.Internal.Control.Concurrent (MonadAsync)
23import Streamly.Internal.Control.Concurrent (MonadAsync)
24−import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))
24+import Streamly.Internal.Data.Stream (Step(..))
25import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
25import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
26import Streamly.Internal.Data.SVar (printSVar, cleanupSVar, sendStopToProducer)
26import Streamly.Internal.Data.SVar (printSVar, cleanupSVar, sendStopToProducer)
27import Streamly.Internal.Data.Unfold.Type (Unfold(..))
27import Streamly.Internal.Data.Unfold.Type (Unfold(..))
src/Streamly/Internal/FileSystem/FD.hs+2−2
@@ -131,7 +131,7 @@ import qualified GHC.IO.Device as RawIO
131import Streamly.Internal.Data.Array.Type
131import Streamly.Internal.Data.Array.Type
132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)
132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)
133import Streamly.Internal.System.IO (defaultChunkSize)
133import Streamly.Internal.System.IO (defaultChunkSize)
134−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
134+import Streamly.Internal.Data.Stream (Stream)
135#if !defined(mingw32_HOST_OS)
135#if !defined(mingw32_HOST_OS)
136{-
136{-
137import Streamly.Internal.Data.Stream.IsStream.Type (toStreamD)
137import Streamly.Internal.Data.Stream.IsStream.Type (toStreamD)
@@ -149,7 +149,7 @@ import qualified Streamly.Internal.Data.MutArray as MArray
149 (MutArray(..), asPtrUnsafe)
149 (MutArray(..), asPtrUnsafe)
150import qualified Streamly.Internal.Data.Stream.Chunked as AS
150import qualified Streamly.Internal.Data.Stream.Chunked as AS
151import qualified Streamly.Internal.Data.Stream as S
151import qualified Streamly.Internal.Data.Stream as S
152−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
152+import qualified Streamly.Internal.Data.Stream as D
153 (Stream(..), Step(..))
153 (Stream(..), Step(..))
154import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)
154import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)
155
155
src/Streamly/Internal/Network/Socket.hs+2−2
@@ -89,7 +89,7 @@ import qualified Network.Socket as Net
89import Streamly.Internal.Data.Array.Type (Array(..))
89import Streamly.Internal.Data.Array.Type (Array(..))
90import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)
90import Streamly.Internal.Data.Stream.Chunked (lpackArraysChunksOf)
91import Streamly.Internal.Data.Fold (Fold)
91import Streamly.Internal.Data.Fold (Fold)
92−import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
92+import Streamly.Internal.Data.Stream (Stream)
93import Streamly.Internal.Data.Unfold.Type (Unfold(..))
93import Streamly.Internal.Data.Unfold.Type (Unfold(..))
94-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
94-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)
95import Streamly.Internal.System.IO (defaultChunkSize)
95import Streamly.Internal.System.IO (defaultChunkSize)
@@ -101,7 +101,7 @@ import qualified Streamly.Internal.Data.Array.Type as A
101import qualified Streamly.Internal.Data.MutArray as MArray
101import qualified Streamly.Internal.Data.MutArray as MArray
102 (MutArray(..), asPtrUnsafe, pinnedNewBytes)
102 (MutArray(..), asPtrUnsafe, pinnedNewBytes)
103import qualified Streamly.Internal.Data.Stream as S
103import qualified Streamly.Internal.Data.Stream as S
104−import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
104+import qualified Streamly.Internal.Data.Stream as D
105 (Stream(..), Step(..))
105 (Stream(..), Step(..))
106import qualified Streamly.Data.Unfold as UF
106import qualified Streamly.Data.Unfold as UF
107import qualified Streamly.Internal.Data.Unfold as UF (first, map)
107import qualified Streamly.Internal.Data.Unfold as UF (first, map)
streamly.cabal+15−13
@@ -410,9 +410,6 @@ library
410 , Streamly.Prelude
410 , Streamly.Prelude
411
411
412 -- Deprecated Internal modules
412 -- Deprecated Internal modules
413− , Streamly.Internal.Data.SVar.Worker
414− , Streamly.Internal.Data.SVar.Dispatch
415− , Streamly.Internal.Data.SVar.Pull
416 , Streamly.Internal.Data.SVar
413 , Streamly.Internal.Data.SVar
417
414
418 , Streamly.Internal.Data.Unfold.SVar
415 , Streamly.Internal.Data.Unfold.SVar
@@ -428,19 +425,10 @@ library
428 , Streamly.Internal.Data.Stream.Ahead
425 , Streamly.Internal.Data.Stream.Ahead
429 , Streamly.Internal.Data.Stream.ZipAsync
426 , Streamly.Internal.Data.Stream.ZipAsync
430
427
431− , Streamly.Internal.Data.Stream.IsStream.Type
428+ , Streamly.Internal.Data.Stream.IsStream
432 , Streamly.Internal.Data.Stream.IsStream.Combinators
429 , Streamly.Internal.Data.Stream.IsStream.Combinators
433 , Streamly.Internal.Data.Stream.IsStream.Common
430 , Streamly.Internal.Data.Stream.IsStream.Common
434 , Streamly.Internal.Data.Stream.IsStream.Enumeration
431 , Streamly.Internal.Data.Stream.IsStream.Enumeration
435− , Streamly.Internal.Data.Stream.IsStream.Generate
436− , Streamly.Internal.Data.Stream.IsStream.Eliminate
437− , Streamly.Internal.Data.Stream.IsStream.Transform
438− , Streamly.Internal.Data.Stream.IsStream.Expand
439− , Streamly.Internal.Data.Stream.IsStream.Reduce
440− , Streamly.Internal.Data.Stream.IsStream.Exception
441− , Streamly.Internal.Data.Stream.IsStream.Lift
442− , Streamly.Internal.Data.Stream.IsStream.Top
443− , Streamly.Internal.Data.Stream.IsStream
444
432
445 if !impl(ghcjs) && flag(dev)
433 if !impl(ghcjs) && flag(dev)
446 exposed-modules:
434 exposed-modules:
@@ -473,6 +461,20 @@ library
473 , Streamly.Data.Stream.Concurrent
461 , Streamly.Data.Stream.Concurrent
474 , Streamly.Data.Stream.Time
462 , Streamly.Data.Stream.Time
475
463
464+ , Streamly.Internal.Data.Stream.IsStream.Type
465+ , Streamly.Internal.Data.Stream.IsStream.Generate
466+ , Streamly.Internal.Data.Stream.IsStream.Eliminate
467+ , Streamly.Internal.Data.Stream.IsStream.Transform
468+ , Streamly.Internal.Data.Stream.IsStream.Expand
469+ , Streamly.Internal.Data.Stream.IsStream.Reduce
470+ , Streamly.Internal.Data.Stream.IsStream.Exception
471+ , Streamly.Internal.Data.Stream.IsStream.Lift
472+ , Streamly.Internal.Data.Stream.IsStream.Top
473+
474+ , Streamly.Internal.Data.SVar.Worker
475+ , Streamly.Internal.Data.SVar.Dispatch
476+ , Streamly.Internal.Data.SVar.Pull
477+
476 build-depends:
478 build-depends:
477 -- Core libraries shipped with ghc, the min and max
479 -- Core libraries shipped with ghc, the min and max
478 -- constraints of these libraries should match with
480 -- constraints of these libraries should match with
test/Streamly/Test/Prelude/Top.hs+1−1
@@ -14,7 +14,7 @@ import Test.QuickCheck
14 )
14 )
15import Test.QuickCheck.Monadic (monadicIO, assert, run)
15import Test.QuickCheck.Monadic (monadicIO, assert, run)
16import qualified Streamly.Prelude as S
16import qualified Streamly.Prelude as S
17−import qualified Streamly.Internal.Data.Stream.IsStream.Top as Top
17+import qualified Streamly.Internal.Data.Stream.IsStream as Top
18
18
19import Prelude hiding
19import Prelude hiding
20 (maximum, minimum, elem, notElem, null, product, sum, head, last, take)
20 (maximum, minimum, elem, notElem, null, product, sum, head, last, take)