Import Data.Stream instead of Data.Stream.StreamD
commit69aa279c6cefaa49eae39ec9e531883884cb9ca0
authorRanjeet Kumar Ranjan <ranjeetr@composewell.com>
dateFri 14 Jul 2023, 11:43 (3 years ago)
parentc307286
benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs+1−1
@@ -7,7 +7,7 @@ import System.Random (randomRIO)
77
88import qualified Streamly.Data.Fold as Fold
99import qualified Streamly.Data.Stream as S
10−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
10+import qualified Streamly.Internal.Data.Stream as Stream
1111
1212import Gauge
1313import Streamly.Benchmark.Common hiding (benchPureSrc)
benchmark/Streamly/Benchmark/Data/Array/Mut.hs+1−1
@@ -47,7 +47,7 @@ import Streamly.Internal.Data.Array.Mut (MutArray)
4747import qualified Streamly.Internal.Data.Array as Array
4848import qualified Streamly.Internal.Data.Array.Mut as MArray
4949import qualified Streamly.Internal.Data.Fold as Fold
50−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
50+import qualified Streamly.Internal.Data.Stream as Stream
5151
5252import Gauge
5353import Streamly.Benchmark.Common hiding (benchPureSrc)
benchmark/Streamly/Benchmark/Data/Array/Stream.hs+4−4
@@ -31,8 +31,8 @@ import Control.Monad.Catch (MonadCatch)
3131import Data.Functor.Identity (runIdentity)
3232import Data.Maybe (isJust)
3333import Data.Word (Word8)
34−import Streamly.Internal.Data.Stream.StreamD (Stream)
35−import Streamly.Internal.Data.Stream.StreamK (StreamK)
34+import Streamly.Internal.Data.Stream (Stream)
35+import Streamly.Internal.Data.StreamK (StreamK)
3636import System.IO (Handle)
3737import System.Random (randomRIO)
3838import Prelude hiding ()
@@ -42,8 +42,8 @@ import qualified Streamly.Internal.Data.Array as Array
4242import qualified Streamly.Internal.Data.Stream.Chunked as ArrayStream
4343import qualified Streamly.Internal.Data.Fold as Fold
4444import qualified Streamly.Internal.Data.Parser as Parser
45−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
46−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
45+import qualified Streamly.Internal.Data.Stream as Stream
46+import qualified Streamly.Internal.Data.StreamK as StreamK
4747import qualified Streamly.Internal.FileSystem.Handle as Handle
4848import qualified Streamly.Internal.Unicode.Stream as Unicode
4949
benchmark/Streamly/Benchmark/Data/Fold.hs+2−2
@@ -25,7 +25,7 @@ import Data.IntMap.Strict (IntMap)
2525import Data.Monoid (Last(..), Sum(..))
2626import System.Random (randomRIO)
2727
28−import Streamly.Internal.Data.Stream.StreamD (Stream)
28+import Streamly.Internal.Data.Stream (Stream)
2929import Streamly.Internal.Data.Fold (Fold(..))
3030import Streamly.Internal.Data.IsMap.HashMap ()
3131import Streamly.Internal.Data.Array.Mut (MutArray)
@@ -35,7 +35,7 @@ import qualified Streamly.Data.Fold.Prelude as Fold
3535import qualified Streamly.Internal.Data.Fold.Container as FL
3636import qualified Streamly.Internal.Data.Unfold as Unfold
3737import qualified Streamly.Internal.Data.Pipe as Pipe
38−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
38+import qualified Streamly.Internal.Data.Stream as Stream
3939
4040import Gauge
4141import Streamly.Benchmark.Common
benchmark/Streamly/Benchmark/Data/Fold/Window.hs+2−2
@@ -4,13 +4,13 @@ module Main (main) where
44
55import Control.DeepSeq (NFData)
66import Streamly.Data.Fold (Fold)
7−import Streamly.Internal.Data.Stream.StreamD (Stream)
7+import Streamly.Internal.Data.Stream (Stream)
88import System.Random (randomRIO)
99
1010import qualified Streamly.Data.Fold as Fold
1111import qualified Streamly.Internal.Data.Ring.Unboxed as Ring
1212import qualified Streamly.Internal.Data.Fold.Window as Window
13−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
13+import qualified Streamly.Internal.Data.Stream as Stream
1414
1515import Streamly.Benchmark.Common
1616import Gauge
benchmark/Streamly/Benchmark/Data/Parser.hs+2−2
@@ -34,7 +34,7 @@ import System.Random (randomRIO)
3434import Streamly.Internal.Data.Fold (Fold(..))
3535import Streamly.Internal.Data.Parser
3636 (ParseError(..), Parser(..), Initial(..), Step(..))
37−import Streamly.Internal.Data.Stream.StreamD (Stream)
37+import Streamly.Internal.Data.Stream (Stream)
3838import Prelude hiding
3939 (any, all, take, sequence, sequence_, sequenceA, takeWhile, dropWhile, span)
4040
@@ -48,7 +48,7 @@ import qualified Streamly.Internal.Data.Parser as PR
4848import qualified Streamly.Data.Stream as Stream
4949import qualified Streamly.Internal.Data.Producer as Producer
5050import qualified Streamly.Internal.Data.Producer.Source as Source
51−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
51+import qualified Streamly.Internal.Data.Stream as Stream
5252
5353import Gauge hiding (env)
5454import Streamly.Benchmark.Common
benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs+2−2
@@ -23,7 +23,7 @@ import Streamly.Internal.Data.Fold.Type (Fold(..))
2323import Streamly.Data.StreamK (StreamK)
2424import Streamly.Internal.Data.Parser
2525 (ParseError(..), Parser(..), Initial(..), Step(..))
26−import Streamly.Internal.Data.Stream.StreamD (Stream)
26+import Streamly.Internal.Data.Stream (Stream)
2727import System.Random (randomRIO)
2828import Prelude hiding
2929 (any, all, take, sequence, sequence_, sequenceA, takeWhile)
@@ -36,7 +36,7 @@ import qualified Streamly.Data.Fold as FL
3636import qualified Streamly.Internal.Data.Fold as Fold
3737import qualified Streamly.Data.Parser as PRD
3838import qualified Streamly.Data.ParserK as PR
39−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
39+import qualified Streamly.Internal.Data.StreamK as StreamK
4040
4141import Gauge
4242import Streamly.Benchmark.Common
benchmark/Streamly/Benchmark/Data/Stream.hs+1−1
@@ -36,7 +36,7 @@ import Streamly.Benchmark.Common
3636#ifdef FUSION_CHECK
3737import Data.Function ((&))
3838import Streamly.Data.Stream (Stream)
39−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
39+import qualified Streamly.Internal.Data.Stream as Stream
4040import qualified Streamly.Internal.Data.Fold as Fold
4141import qualified Data.Foldable as Foldable
4242import Stream.Common
benchmark/Streamly/Benchmark/Data/Stream/Common.hs+7−7
@@ -90,15 +90,15 @@ import Streamly.Benchmark.Prelude
9090 , concatStreamsWith
9191 )
9292#else
93−import Streamly.Internal.Data.Stream.StreamD (Stream)
94−import qualified Streamly.Internal.Data.Stream.StreamD as D
93+import Streamly.Internal.Data.Stream (Stream)
94+import qualified Streamly.Internal.Data.Stream as D
9595#ifdef USE_STREAMK
96−import Streamly.Internal.Data.Stream.StreamK (StreamK)
97−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
98−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
96+import Streamly.Internal.Data.StreamK (StreamK)
97+import qualified Streamly.Internal.Data.Stream as Stream
98+import qualified Streamly.Internal.Data.StreamK as StreamK
9999#else
100−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
101−import qualified Streamly.Internal.Data.Stream.StreamD as StreamK
100+import qualified Streamly.Internal.Data.Stream as Stream
101+import qualified Streamly.Internal.Data.Stream as StreamK
102102#endif
103103#endif
104104
benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hs+5−5
@@ -37,7 +37,7 @@ import qualified Streamly.Internal.Data.Fold as Fold
3737#ifdef INSPECTION
3838import GHC.Types (SPEC(..))
3939import Test.Inspection
40−import qualified Streamly.Internal.Data.Stream.StreamD as D
40+import qualified Streamly.Internal.Data.Stream as D
4141#endif
4242
4343#ifdef USE_PRELUDE
@@ -47,13 +47,13 @@ import qualified Streamly.Internal.Data.Stream.IsStream as S
4747import qualified Streamly.Internal.Data.Stream.IsStream as StreamK
4848#else
4949import Stream.Common
50−import Streamly.Internal.Data.Stream.StreamD (Stream)
51−import qualified Streamly.Internal.Data.Stream.StreamD as S
50+import Streamly.Internal.Data.Stream (Stream)
51+import qualified Streamly.Internal.Data.Stream as S
5252#ifdef USE_STREAMK
53−import Streamly.Internal.Data.Stream.StreamK (StreamK)
53+import Streamly.Internal.Data.StreamK (StreamK)
5454import qualified Streamly.Data.StreamK as StreamK
5555#else
56−import qualified Streamly.Internal.Data.Stream.StreamD as StreamK
56+import qualified Streamly.Internal.Data.Stream as StreamK
5757#endif
5858#endif
5959
benchmark/Streamly/Benchmark/Data/Stream/Exceptions.hs+2−2
@@ -41,7 +41,7 @@ import qualified Streamly.Internal.Data.Unfold.Exception as IUF
4141#ifdef USE_PRELUDE
4242import qualified Streamly.Internal.Data.Stream.IsStream as Stream
4343#else
44−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
44+import qualified Streamly.Internal.Data.Stream as Stream
4545import qualified Streamly.Internal.Data.Stream.Exception.Lifted as Stream
4646#endif
4747
@@ -53,7 +53,7 @@ import Streamly.Benchmark.Common.Handle
5353#ifdef INSPECTION
5454import Test.Inspection
5555
56−import qualified Streamly.Internal.Data.Stream.StreamD as D
56+import qualified Streamly.Internal.Data.Stream as D
5757#endif
5858
5959#ifdef USE_PRELUDE
benchmark/Streamly/Benchmark/Data/Stream/Expand.hs+6−6
@@ -29,7 +29,7 @@ module Stream.Expand (benchmarks) where
2929import GHC.Types (SPEC(..))
3030import Test.Inspection
3131
32−import qualified Streamly.Internal.Data.Stream.StreamD as D
32+import qualified Streamly.Internal.Data.Stream as D
3333#endif
3434
3535import qualified Stream.Common as Common
@@ -42,15 +42,15 @@ import Streamly.Benchmark.Prelude
4242 ( sourceFoldMapM, sourceFoldMapWith, sourceFoldMapWithM
4343 , sourceFoldMapWithStream, concatFoldableWith, concatForFoldableWith)
4444#else
45−import qualified Streamly.Internal.Data.Stream.StreamD as S
45+import qualified Streamly.Internal.Data.Stream as S
4646#ifdef USE_STREAMK
47−import Streamly.Internal.Data.Stream.StreamD (Stream)
48−import Streamly.Internal.Data.Stream.StreamK (StreamK, CrossStreamK)
47+import Streamly.Internal.Data.Stream (Stream)
48+import Streamly.Internal.Data.StreamK (StreamK, CrossStreamK)
4949import qualified Control.Applicative as AP
5050import qualified Streamly.Internal.Data.Fold as Fold
51−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
51+import qualified Streamly.Internal.Data.StreamK as StreamK
5252#else
53−import qualified Streamly.Internal.Data.Stream.StreamD as StreamK
53+import qualified Streamly.Internal.Data.Stream as StreamK
5454#endif
5555#endif
5656
benchmark/Streamly/Benchmark/Data/Stream/Generate.hs+3−3
@@ -31,11 +31,11 @@ import qualified Streamly.Prelude as S
3131import qualified Streamly.Internal.Data.Stream.IsStream as Stream
3232#else
3333import Stream.Common
34−import Streamly.Internal.Data.Stream.StreamD (Stream)
35−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
34+import Streamly.Internal.Data.Stream (Stream)
35+import qualified Streamly.Internal.Data.Stream as Stream
3636#ifdef USE_STREAMK
3737import System.IO.Unsafe (unsafeInterleaveIO)
38−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
38+import qualified Streamly.Internal.Data.StreamK as StreamK
3939import qualified Stream.Common as Common
4040#endif
4141#endif
benchmark/Streamly/Benchmark/Data/Stream/Lift.hs+4−4
@@ -27,12 +27,12 @@ import qualified Streamly.Internal.Data.Fold as Fold
2727#ifdef USE_PRELUDE
2828import qualified Streamly.Internal.Data.Stream.IsStream as Stream
2929#else
30−import Streamly.Internal.Data.Stream.StreamD (Stream)
31−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
30+import Streamly.Internal.Data.Stream (Stream)
31+import qualified Streamly.Internal.Data.Stream as Stream
3232#ifdef USE_STREAMK
3333import Stream.Common (benchIO, drain)
34−import Streamly.Internal.Data.Stream.StreamK (StreamK)
35−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
34+import Streamly.Internal.Data.StreamK (StreamK)
35+import qualified Streamly.Internal.Data.StreamK as StreamK
3636import qualified Control.Monad.State.Strict as State
3737#endif
3838#endif
benchmark/Streamly/Benchmark/Data/Stream/Reduce.hs+5−5
@@ -44,19 +44,19 @@ import Streamly.Benchmark.Prelude hiding
4444 , transformComposeMapM, transformTeeMapM, transformZipMapM)
4545#else
4646
47−import Streamly.Internal.Data.Stream.StreamD (Stream)
48−import qualified Streamly.Internal.Data.Stream.StreamD as S
47+import Streamly.Internal.Data.Stream (Stream)
48+import qualified Streamly.Internal.Data.Stream as S
4949#ifndef USE_STREAMLY_CORE
5050import qualified Streamly.Data.Stream.Prelude as S
5151import qualified Streamly.Internal.Data.Stream.Time as S
5252#endif
5353
5454#ifdef USE_STREAMK
55−import Streamly.Internal.Data.Stream.StreamK (StreamK)
55+import Streamly.Internal.Data.StreamK (StreamK)
5656import qualified Streamly.Internal.Data.Parser as PR
57−import qualified Streamly.Internal.Data.Stream.StreamK as K
57+import qualified Streamly.Internal.Data.StreamK as K
5858#else
59−import qualified Streamly.Internal.Data.Stream.StreamD as K
59+import qualified Streamly.Internal.Data.Stream as K
6060#endif
6161
6262#endif
benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+1−1
@@ -30,7 +30,7 @@ import System.Random (randomRIO)
3030import Prelude hiding (tail, mapM_, foldl, last, map, mapM, concatMap, zip)
3131
3232import qualified Prelude as P
33−import qualified Streamly.Internal.Data.Stream.StreamD as S
33+import qualified Streamly.Internal.Data.Stream as S
3434import qualified Streamly.Internal.Data.Unfold as UF
3535import qualified Streamly.Internal.Data.Fold as FL
3636
benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+1−1
@@ -34,7 +34,7 @@ import qualified Prelude as P
3434import qualified Data.List as List
3535
3636import qualified Streamly.Internal.Data.Stream.StreamK.Type as S
37−import qualified Streamly.Internal.Data.Stream.StreamK as S
37+import qualified Streamly.Internal.Data.StreamK as S
3838
3939import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)
4040
benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs+2−2
@@ -34,8 +34,8 @@ import qualified Prelude as P
3434-- import qualified Data.List as List
3535
3636import qualified Streamly.Internal.Data.Stream.StreamK.Type as S
37−import qualified Streamly.Internal.Data.Stream.StreamK as S
38−import qualified Streamly.Internal.Data.Stream.StreamD as D
37+import qualified Streamly.Internal.Data.StreamK as S
38+import qualified Streamly.Internal.Data.Stream as D
3939import qualified Streamly.Internal.Data.Fold as Fold
4040
4141import Gauge (bgroup, Benchmark, defaultMain)
benchmark/Streamly/Benchmark/Data/Stream/Transform.hs+4−4
@@ -43,8 +43,8 @@ import qualified Streamly.Internal.Data.Fold as Fold
4343import qualified Streamly.Internal.Data.Stream.IsStream as Stream
4444import Streamly.Internal.Data.Time.Units
4545#else
46−import Streamly.Internal.Data.Stream.StreamD (Stream)
47−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
46+import Streamly.Internal.Data.Stream (Stream)
47+import qualified Streamly.Internal.Data.Stream as Stream
4848#ifndef USE_STREAMLY_CORE
4949import qualified Streamly.Internal.Data.Stream.Time as Stream
5050#endif
@@ -53,8 +53,8 @@ import Control.DeepSeq (NFData(..))
5353import Data.Functor.Identity (Identity(..))
5454import qualified Prelude
5555import qualified Streamly.Internal.Data.Fold as Fold
56−import Streamly.Internal.Data.Stream.StreamK (StreamK)
57−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
56+import Streamly.Internal.Data.StreamK (StreamK)
57+import qualified Streamly.Internal.Data.StreamK as StreamK
5858#endif
5959#endif
6060
benchmark/Streamly/Benchmark/Data/Unfold.hs+3−3
@@ -32,9 +32,9 @@ import qualified Streamly.FileSystem.Handle as FH
3232import qualified Streamly.Internal.Data.Fold as FL
3333import qualified Streamly.Internal.Data.Unfold as UF
3434import qualified Streamly.Internal.Data.Unfold.Exception as UF
35−import qualified Streamly.Internal.Data.Stream.StreamD as S
36−import qualified Streamly.Internal.Data.Stream.StreamD as D
37−import qualified Streamly.Internal.Data.Stream.StreamK as K
35+import qualified Streamly.Internal.Data.Stream as S
36+import qualified Streamly.Internal.Data.Stream as D
37+import qualified Streamly.Internal.Data.StreamK as K
3838
3939import Gauge hiding (env)
4040import Prelude hiding (take, filter, zipWith, map, mapM, takeWhile)
benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+2−2
@@ -35,7 +35,7 @@ import qualified Streamly.FileSystem.Handle as FH
3535import qualified Streamly.Internal.Data.Array as A
3636import qualified Streamly.Internal.Data.Array.Type as AT
3737import qualified Streamly.Internal.Data.Fold as FL
38−import qualified Streamly.Internal.Data.Stream.StreamD as IP
38+import qualified Streamly.Internal.Data.Stream as IP
3939import qualified Streamly.Internal.FileSystem.Handle as IFH
4040import qualified Streamly.Internal.Unicode.Stream as IUS
4141import qualified Streamly.Data.Stream.Prelude as S
@@ -49,7 +49,7 @@ import Streamly.Benchmark.Common.Handle
4949import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)
5050
5151import qualified Streamly.Internal.Data.Array.Mut.Type as MA
52−import qualified Streamly.Internal.Data.Stream.StreamD as D
52+import qualified Streamly.Internal.Data.Stream as D
5353import qualified Streamly.Internal.Data.Unfold as IUF
5454
5555import Test.Inspection
benchmark/Streamly/Benchmark/Prelude/Merge.hs+1−1
@@ -36,7 +36,7 @@ import Gauge
3636import GHC.Types (SPEC(..))
3737import Test.Inspection
3838
39−import qualified Streamly.Internal.Data.Stream.StreamD as D
39+import qualified Streamly.Internal.Data.Stream as D
4040#endif
4141
4242moduleName :: String
benchmark/Streamly/Benchmark/Prelude/WSerial.hs+1−1
@@ -35,7 +35,7 @@ import Gauge
3535import GHC.Types (SPEC(..))
3636import Test.Inspection
3737
38−import qualified Streamly.Internal.Data.Stream.StreamD as D
38+import qualified Streamly.Internal.Data.Stream as D
3939#endif
4040
4141moduleName :: String
benchmark/Streamly/Benchmark/Prelude/ZipSerial.hs+1−1
@@ -35,7 +35,7 @@ import Gauge
3535import GHC.Types (SPEC(..))
3636import Test.Inspection
3737
38−import qualified Streamly.Internal.Data.Stream.StreamD as D
38+import qualified Streamly.Internal.Data.Stream as D
3939#endif
4040
4141moduleName :: String
benchmark/Streamly/Benchmark/Unicode/Char.hs+1−1
@@ -24,7 +24,7 @@ import Streamly.Internal.Unicode.Char
2424import Streamly.Benchmark.Common (o_1_space_prefix)
2525
2626import qualified Streamly.Internal.Data.Array as Array
27−import qualified Streamly.Internal.Data.Stream.StreamD as IsStream
27+import qualified Streamly.Internal.Data.Stream as IsStream
2828import qualified System.Directory as Dir
2929
3030--------------------------------------------------------------------------------
benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1
@@ -27,7 +27,7 @@ import System.IO (Handle)
2727
2828import qualified Streamly.Data.Array as Array
2929import qualified Streamly.Data.Fold as Fold
30−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
30+import qualified Streamly.Internal.Data.Stream as Stream
3131import qualified Streamly.Internal.Data.Unfold as Unfold
3232import qualified Streamly.Internal.FileSystem.Handle as Handle
3333import qualified Streamly.Internal.Unicode.Array as UnicodeArr
benchmark/lib/Streamly/Benchmark/Common.hs+1−1
@@ -54,7 +54,7 @@ import Data.Functor.Identity (Identity, runIdentity)
5454import System.Random (randomRIO)
5555
5656import qualified Streamly.Internal.Data.Fold as Fold
57−import qualified Streamly.Internal.Data.Stream.StreamD as S
57+import qualified Streamly.Internal.Data.Stream as S
5858
5959import Gauge
6060
core/src/DocTestDataStreamK.hs+1−1
@@ -16,6 +16,6 @@
1616
1717For APIs that have not been released yet.
1818
19−>>> import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
19+>>> import qualified Streamly.Internal.Data.StreamK as StreamK
2020>>> import qualified Streamly.Internal.FileSystem.Dir as Dir
2121-}
core/src/Streamly/Data/Stream.hs+4−4
@@ -497,10 +497,7 @@ where
497497import Control.Monad.IO.Class (MonadIO)
498498import Data.Word (Word8)
499499import Streamly.Data.Array (Array)
500−
501−import qualified Streamly.Internal.Data.Array.Type as Array
502−import qualified Streamly.Internal.Data.Stream.Chunked as ArrayStream
503−import Streamly.Internal.Data.Stream.StreamD
500+import Streamly.Internal.Data.Stream
504501import Prelude
505502 hiding (filter, drop, dropWhile, take, takeWhile, zipWith, foldr,
506503 foldl, map, mapM, mapM_, sequence, all, any, sum, product, elem,
@@ -508,6 +505,9 @@ import Prelude
508505 reverse, iterate, init, and, or, lookup, foldr1, (!!),
509506 scanl, scanl1, repeat, replicate, concatMap, span)
510507
508+import qualified Streamly.Internal.Data.Array.Type as Array
509+import qualified Streamly.Internal.Data.Stream.Chunked as ArrayStream
510+
511511#include "DocTestDataStream.hs"
512512
513513-- $overview
core/src/Streamly/Data/StreamK.hs+2−2
@@ -12,7 +12,7 @@
1212-- section in the "Streamly.Data.Stream" module to know when to use this
1313-- module.
1414--
15−-- Please refer to "Streamly.Internal.Data.Stream.StreamK" for more functions
15+-- Please refer to "Streamly.Internal.Data.StreamK" for more functions
1616-- that have not yet been released.
1717--
1818-- Some useful idioms:
@@ -125,7 +125,7 @@ module Streamly.Data.StreamK
125125 )
126126where
127127
128−import Streamly.Internal.Data.Stream.StreamK
128+import Streamly.Internal.Data.StreamK
129129import Prelude hiding (reverse, zipWith, mapM, dropWhile, take)
130130
131131#include "DocTestDataStreamK.hs"
core/src/Streamly/Internal/Console/Stdio.hs+2−2
@@ -47,12 +47,12 @@ import System.IO (stdin, stdout, stderr)
4747import Prelude hiding (read)
4848
4949import Streamly.Internal.Data.Array.Type (Array(..))
50−import Streamly.Internal.Data.Stream.StreamD (Stream)
50+import Streamly.Internal.Data.Stream (Stream)
5151import Streamly.Internal.Data.Unfold (Unfold)
5252import Streamly.Internal.Data.Fold (Fold)
5353
5454import qualified Streamly.Internal.Data.Array as Array
55−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
55+import qualified Streamly.Internal.Data.Stream as Stream
5656 (intersperseMSuffix)
5757import qualified Streamly.Internal.Data.Unfold as Unfold
5858import qualified Streamly.Internal.FileSystem.Handle as Handle
core/src/Streamly/Internal/Data/Array.hs+3−3
@@ -126,7 +126,7 @@ import Streamly.Internal.Data.Array.Type
126126 (Array(..), length, asPtrUnsafe)
127127import Streamly.Internal.Data.Fold.Type (Fold(..))
128128import Streamly.Internal.Data.Producer.Type (Producer(..))
129−import Streamly.Internal.Data.Stream.StreamD (Stream)
129+import Streamly.Internal.Data.Stream (Stream)
130130import Streamly.Internal.Data.Tuple.Strict (Tuple3Fused'(..))
131131import Streamly.Internal.Data.Unfold.Type (Unfold(..))
132132import Streamly.Internal.System.IO (unsafeInlineIO)
@@ -138,8 +138,8 @@ import qualified Streamly.Internal.Data.Fold as FL
138138import qualified Streamly.Internal.Data.Producer.Type as Producer
139139import qualified Streamly.Internal.Data.Producer as Producer
140140import qualified Streamly.Internal.Data.Ring.Unboxed as RB
141−import qualified Streamly.Internal.Data.Stream.StreamD as D
142−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
141+import qualified Streamly.Internal.Data.Stream as D
142+import qualified Streamly.Internal.Data.Stream as Stream
143143import qualified Streamly.Internal.Data.Unfold as Unfold
144144
145145#include "DocTestDataArray.hs"
core/src/Streamly/Internal/Data/Array/Mut.hs+2−2
@@ -20,10 +20,10 @@ where
2020
2121import Control.Monad.IO.Class (MonadIO(..))
2222import Streamly.Internal.Data.Unbox (Unbox)
23−import Streamly.Internal.Data.Stream.StreamD (Stream)
23+import Streamly.Internal.Data.Stream (Stream)
2424import Streamly.Internal.Data.Unfold.Type (Unfold(..))
2525
26−import qualified Streamly.Internal.Data.Stream.StreamD as D
26+import qualified Streamly.Internal.Data.Stream as D
2727import qualified Streamly.Internal.Data.Unfold as Unfold
2828
2929import Prelude hiding (foldr, length, read, splitAt)
core/src/Streamly/Internal/Data/Array/Mut/Stream.hs+1−1
@@ -40,8 +40,8 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
4040
4141import qualified Streamly.Internal.Data.Array.Mut.Type as MArray
4242import qualified Streamly.Internal.Data.Fold.Type as FL
43−import qualified Streamly.Internal.Data.Stream.StreamD as D
4443import qualified Streamly.Internal.Data.Parser as ParserD
44+import qualified Streamly.Internal.Data.Stream as D
4545
4646-- | @chunksOf n stream@ groups the elements in the input stream into arrays of
4747-- @n@ elements each.
core/src/Streamly/Internal/Data/Pipe.hs+2−2
@@ -256,8 +256,8 @@ import Streamly.Internal.Data.Pipe.Type
256256
257257-- import qualified Streamly.Internal.Data.Array.Type as A
258258-- import qualified Streamly.Data.Stream as S
259−-- import qualified Streamly.Internal.Data.Stream.StreamD as D
260−-- import qualified Streamly.Internal.Data.Stream.StreamK as K
259+-- import qualified Streamly.Internal.Data.Stream as D
260+-- import qualified Streamly.Internal.Data.StreamK as K
261261-- import qualified Streamly.Internal.Data.Stream.Common as P
262262
263263------------------------------------------------------------------------------
core/src/Streamly/Internal/Data/Stream/Bottom.hs+2−2
@@ -79,8 +79,8 @@ import Streamly.Internal.Data.SVar.Type (defState)
7979
8080import qualified Streamly.Internal.Data.Array.Type as A
8181import qualified Streamly.Internal.Data.Fold as Fold
82−import qualified Streamly.Internal.Data.Stream.StreamK as K
83−import qualified Streamly.Internal.Data.Stream.StreamD as D
82+import qualified Streamly.Internal.Data.StreamK as K
83+import qualified Streamly.Internal.Data.Stream as D
8484
8585import Prelude hiding (take, takeWhile, drop, reverse, concatMap, map, zipWith)
8686
core/src/Streamly/Internal/Data/Stream/Chunked.hs+4−4
@@ -80,8 +80,8 @@ import Streamly.Internal.Data.Array.Type (Array(..))
8080import Streamly.Internal.Data.Array.Mut.Type (MutArray)
8181import Streamly.Internal.Data.Fold.Chunked (ChunkFold(..))
8282import Streamly.Internal.Data.Parser (ParseError(..))
83−import Streamly.Internal.Data.Stream.StreamD (Stream)
84−import Streamly.Internal.Data.Stream.StreamK (StreamK, fromStream, toStream)
83+import Streamly.Internal.Data.Stream (Stream)
84+import Streamly.Internal.Data.StreamK (StreamK, fromStream, toStream)
8585import Streamly.Internal.Data.SVar.Type (adaptState, defState)
8686import Streamly.Internal.Data.Array.Mut.Type
8787 (allocBytesToElemCount)
@@ -97,8 +97,8 @@ import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))
9797import qualified Streamly.Internal.Data.Parser as PR
9898import qualified Streamly.Internal.Data.Parser as PRD
9999 (Parser(..), Initial(..))
100−import qualified Streamly.Internal.Data.Stream.StreamD as D
101−import qualified Streamly.Internal.Data.Stream.StreamK as K
100+import qualified Streamly.Internal.Data.Stream as D
101+import qualified Streamly.Internal.Data.StreamK as K
102102
103103-- XXX Since these are immutable arrays MonadIO constraint can be removed from
104104-- most places.
core/src/Streamly/Internal/Data/Stream/Eliminate.hs+2−2
@@ -87,9 +87,9 @@ import qualified Streamly.Internal.Data.Array.Type as Array
8787import qualified Streamly.Internal.Data.Fold as Fold
8888import qualified Streamly.Internal.Data.Parser as PRD
8989import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK
90−import qualified Streamly.Internal.Data.Stream.StreamD as D
90+import qualified Streamly.Internal.Data.Stream as D
9191import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
92−import qualified Streamly.Internal.Data.Stream.StreamK as K
92+import qualified Streamly.Internal.Data.StreamK as K
9393
9494import Streamly.Internal.Data.Stream.Bottom
9595import Streamly.Internal.Data.Stream.Type hiding (Stream)
core/src/Streamly/Internal/Data/Stream/Exception.hs+1−1
@@ -27,7 +27,7 @@ import Control.Monad.Catch (MonadCatch)
2727import Control.Monad.IO.Class (MonadIO)
2828import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)
2929
30−import qualified Streamly.Internal.Data.Stream.StreamD as D
30+import qualified Streamly.Internal.Data.Stream as D
3131
3232-- $setup
3333-- >>> :m
core/src/Streamly/Internal/Data/Stream/Expand.hs+2−2
@@ -147,8 +147,8 @@ import Streamly.Internal.Data.Stream.Type
147147 , bindWith, concatMapWith, cons, nil)
148148import Streamly.Internal.Data.Unfold.Type (Unfold)
149149
150−import qualified Streamly.Internal.Data.Stream.StreamD as D
151−import qualified Streamly.Internal.Data.Stream.StreamK as K (mergeBy, mergeByM)
150+import qualified Streamly.Internal.Data.Stream as D
151+import qualified Streamly.Internal.Data.StreamK as K (mergeBy, mergeByM)
152152import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
153153
154154import Prelude hiding (concat, concatMap, zipWith)
core/src/Streamly/Internal/Data/Stream/Generate.hs+1−1
@@ -84,7 +84,7 @@ import Streamly.Internal.Data.Unfold.Type (Unfold)
8484
8585import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed
8686import qualified Streamly.Internal.Data.Stream.Bottom as Bottom
87−import qualified Streamly.Internal.Data.Stream.StreamD as D
87+import qualified Streamly.Internal.Data.Stream as D
8888import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
8989import qualified Streamly.Internal.Data.Stream.Type as Stream
9090import qualified Streamly.Internal.Data.Stream.Transform as Stream (sequence)
core/src/Streamly/Internal/Data/Stream/Lift.hs+2−2
@@ -23,8 +23,8 @@ import Data.Functor.Identity (Identity (..))
2323import Streamly.Internal.Data.Stream.Type
2424 (Stream, fromStreamD, toStreamD, fromStreamK, toStreamK)
2525
26−import qualified Streamly.Internal.Data.Stream.StreamD as D
27−import qualified Streamly.Internal.Data.Stream.StreamK as K
26+import qualified Streamly.Internal.Data.Stream as D
27+import qualified Streamly.Internal.Data.StreamK as K
2828
2929-- $setup
3030-- >>> :m
core/src/Streamly/Internal/Data/Stream/Reduce.hs+1−1
@@ -69,7 +69,7 @@ import Streamly.Internal.Data.Unbox (Unbox)
6969
7070import qualified Streamly.Internal.Data.Array.Type as Array
7171import qualified Streamly.Internal.Data.Parser as ParserD
72−import qualified Streamly.Internal.Data.Stream.StreamD as D
72+import qualified Streamly.Internal.Data.Stream as D
7373
7474import Prelude hiding (concatMap, map)
7575
core/src/Streamly/Internal/Data/Stream/StreamK/Transformer.hs+1−1
@@ -18,7 +18,7 @@ where
1818
1919import Control.Monad.Trans.Class (MonadTrans(lift))
2020import Control.Monad.Trans.State.Strict (StateT)
21−import Streamly.Internal.Data.Stream.StreamK
21+import Streamly.Internal.Data.StreamK
2222 (StreamK, nil, cons, uncons, concatEffect)
2323
2424import qualified Control.Monad.Trans.State.Strict as State
core/src/Streamly/Internal/Data/Stream/StreamK.hs → core/src/Streamly/Internal/Data/StreamK.hsrenamed+3−3
@@ -1,6 +1,6 @@
11{-# LANGUAGE CPP #-}
22-- |
3−-- Module : Streamly.Internal.Data.Stream.StreamK
3+-- Module : Streamly.Internal.Data.StreamK
44-- Copyright : (c) 2017 Composewell Technologies
55--
66-- License : BSD3
@@ -8,7 +8,7 @@
88-- Stability : experimental
99-- Portability : GHC
1010--
11−module Streamly.Internal.Data.Stream.StreamK
11+module Streamly.Internal.Data.StreamK
1212 (
1313 -- * Setup
1414 -- | To execute the code examples provided in this module in ghci, please
@@ -208,7 +208,7 @@ import qualified Streamly.Internal.Data.Fold.Type as FL
208208import qualified Streamly.Internal.Data.Parser as Parser
209209import qualified Streamly.Internal.Data.Parser.ParserD.Type as PR
210210import qualified Streamly.Internal.Data.Parser.ParserK.Type as ParserK
211−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
211+import qualified Streamly.Internal.Data.Stream as Stream
212212import qualified Prelude
213213
214214import Prelude
core/src/Streamly/Internal/FileSystem/Handle.hs+1−1
@@ -136,7 +136,7 @@ import qualified Streamly.Internal.Data.Stream.Chunked as AS
136136import qualified Streamly.Internal.Data.Array.Mut.Type as MArray
137137import qualified Streamly.Internal.Data.Refold.Type as Refold
138138import qualified Streamly.Internal.Data.Fold.Type as FL(refoldMany)
139−import qualified Streamly.Internal.Data.Stream.StreamD as S
139+import qualified Streamly.Internal.Data.Stream as S
140140import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
141141 (Stream(..), Step(..))
142142import qualified Streamly.Internal.Data.Unfold as UF
core/src/Streamly/Internal/Serialize/ToBytes.hs+4−4
@@ -47,12 +47,12 @@ import Data.Char (ord)
4747import Data.Int (Int8, Int16, Int32, Int64)
4848import Data.Word (Word8, Word16, Word32, Word64)
4949import GHC.Float (castDoubleToWord64, castFloatToWord32)
50−import Streamly.Internal.Data.Stream.StreamD (Stream)
51−import Streamly.Internal.Data.Stream.StreamD (Step(..))
50+import Streamly.Internal.Data.Stream (Stream)
51+import Streamly.Internal.Data.Stream (Step(..))
5252import Streamly.Internal.Unicode.Stream (readCharUtf8)
5353
54−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
55−import qualified Streamly.Internal.Data.Stream.StreamD as D
54+import qualified Streamly.Internal.Data.Stream as Stream
55+import qualified Streamly.Internal.Data.Stream as D
5656
5757-- XXX Use StreamD directly?
5858
core/src/Streamly/Internal/Unicode/Stream.hs+4−4
@@ -104,8 +104,8 @@ import System.IO.Unsafe (unsafePerformIO)
104104import Streamly.Internal.Data.Array.Type (Array(..))
105105import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)
106106import Streamly.Internal.Data.Fold (Fold)
107−import Streamly.Internal.Data.Stream.StreamD (Stream)
108−import Streamly.Internal.Data.Stream.StreamD (Step (..))
107+import Streamly.Internal.Data.Stream (Stream)
108+import Streamly.Internal.Data.Stream (Step (..))
109109import Streamly.Internal.Data.SVar.Type (adaptState)
110110import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
111111import Streamly.Internal.Data.Unbox (peekWith)
@@ -117,8 +117,8 @@ import qualified Streamly.Data.Unfold as Unfold
117117import qualified Streamly.Internal.Data.Array.Type as Array
118118import qualified Streamly.Internal.Data.Parser as Parser (Parser)
119119import qualified Streamly.Internal.Data.Parser as ParserD
120−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
121−import qualified Streamly.Internal.Data.Stream.StreamD as D
120+import qualified Streamly.Internal.Data.Stream as Stream
121+import qualified Streamly.Internal.Data.Stream as D
122122
123123import Prelude hiding (lines, words, unlines, unwords)
124124
core/streamly-core.cabal+1−1
@@ -311,7 +311,7 @@ library
311311 , Streamly.Internal.Data.Array.Generic.Mut.Type
312312
313313 -- streamly-core-streams
314− , Streamly.Internal.Data.Stream.StreamK
314+ , Streamly.Internal.Data.StreamK
315315 -- StreamD depends on streamly-array-types
316316 , Streamly.Internal.Data.Stream.StreamD.Generate
317317 , Streamly.Internal.Data.Stream.StreamD.Eliminate
docs/Developer/optimization-guidelines.md+1−1
@@ -244,7 +244,7 @@ We also use INLINE [3] in some cases.
244244
245245The combinators in `Streamly.Prelude` are defined in terms of combinators in
246246`Streamly.Internal.Data.Stream.StreamD` (Direct style streams) or
247−`Streamly.Internal.Data.Stream.StreamK` (CPS style streams). We convert the
247+`Streamly.Internal.Data.StreamK` (CPS style streams). We convert the
248248stream from `StreamD` to `StreamK` representation or vice versa in some cases.
249249
250250Most operations use the StreamD representation, however, stream append
docs/User/Project/Upgrading.md+2−2
@@ -153,8 +153,8 @@ module. You can use the following equivalent definitions:
153153>>> and = Stream.fold Fold.and
154154>>> all p = Stream.fold (Fold.all p)
155155>>> (!!) i = Stream.fold (Fold.index i)
156−>>> tail = Streamly.Internal.Data.Stream.StreamK.tail
157−>>> init = Streamly.Internal.Data.Stream.StreamK.init
156+>>> tail = Streamly.Internal.Data.StreamK.tail
157+>>> init = Streamly.Internal.Data.StreamK.init
158158```
159159
160160Mapping functions:
src/Streamly/Internal/Data/SmallArray.hs+1−1
@@ -53,7 +53,7 @@ import Streamly.Data.Stream (Stream)
5353import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))
5454import Streamly.Internal.Data.Unfold.Type (Unfold(..))
5555
56−import qualified Streamly.Internal.Data.Stream.StreamD as D
56+import qualified Streamly.Internal.Data.Stream as D
5757import qualified Streamly.Internal.Data.Fold.Type as FL
5858 (Fold (..), Step (Done, Partial))
5959
src/Streamly/Internal/Data/Stream/Concurrent.hs+4−4
@@ -111,12 +111,12 @@ import Streamly.Internal.Data.Stream.Channel.Types
111111 )
112112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)
113113import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
114−import Streamly.Internal.Data.Stream.StreamD (Step(..))
114+import Streamly.Internal.Data.Stream (Step(..))
115115
116116import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed
117−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
118−import qualified Streamly.Internal.Data.Stream.StreamD as D
119−import qualified Streamly.Internal.Data.Stream.StreamK as K
117+import qualified Streamly.Internal.Data.Stream as Stream
118+import qualified Streamly.Internal.Data.Stream as D
119+import qualified Streamly.Internal.Data.StreamK as K
120120import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
121121
122122import Prelude hiding (mapM, sequence, concat, concatMap, zipWith)
src/Streamly/Internal/Data/Stream/Concurrent/Channel.hs+2−2
@@ -51,7 +51,7 @@ module Streamly.Internal.Data.Stream.Concurrent.Channel
5151where
5252
5353import Streamly.Internal.Control.Concurrent (MonadAsync)
54−import Streamly.Internal.Data.Stream.StreamD (Stream)
54+import Streamly.Internal.Data.Stream (Stream)
5555import Streamly.Internal.Data.Stream.Concurrent.Channel.Operations
5656 (fromChannel, fromChannelK, toChannel, toChannelK)
5757
@@ -59,7 +59,7 @@ import qualified Streamly.Internal.Data.Stream.Concurrent.Channel.Append
5959 as Append
6060import qualified Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave
6161 as Interleave
62−import qualified Streamly.Internal.Data.Stream.StreamK as K
62+import qualified Streamly.Internal.Data.StreamK as K
6363
6464import Streamly.Internal.Data.Stream.Concurrent.Channel.Type
6565import Streamly.Internal.Data.Stream.Channel.Types
src/Streamly/Internal/Data/Stream/Concurrent/Channel/Operations.hs+1−1
@@ -38,7 +38,7 @@ import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
3838import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)
3939import System.Mem (performMajorGC)
4040
41−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
41+import qualified Streamly.Internal.Data.Stream as Stream
4242import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
4343import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
4444
src/Streamly/Internal/Data/Stream/Exception/Lifted.hs+2−2
@@ -38,11 +38,11 @@ import Streamly.Internal.Control.Concurrent
3838import Streamly.Internal.Data.Stream.StreamD.Type (Stream)
3939import Streamly.Internal.Data.IOFinalizer.Lifted
4040 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)
41−import Streamly.Internal.Data.Stream.StreamD (Step(..))
41+import Streamly.Internal.Data.Stream (Step(..))
4242
4343import qualified Control.Monad.Catch as MC
4444import qualified Data.Map.Strict as Map
45−import qualified Streamly.Internal.Data.Stream.StreamD as D
45+import qualified Streamly.Internal.Data.Stream as D
4646
4747-- $setup
4848-- >>> :m
src/Streamly/Internal/Data/Stream/IsStream.hs+1−1
@@ -39,7 +39,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type
3939 hiding (cmpBy, drain, eqBy, foldl', fold, toList, toStream
4040 , fromEffect, fromPure, repeat, fromStream)
4141
42−import qualified Streamly.Internal.Data.Stream.StreamD as D
42+import qualified Streamly.Internal.Data.Stream as D
4343
4444{-# INLINE fromStream #-}
4545fromStream :: (IsStream t, Monad m) => D.Stream m a -> t m a
src/Streamly/Internal/Data/Stream/IsStream/Common.hs+1−1
@@ -87,7 +87,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
8787import qualified Streamly.Internal.Data.Stream.Parallel as Par
8888import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
8989 (fromPure, fromEffect, repeatMWith, reverse)
90−import qualified Streamly.Internal.Data.Stream.StreamD as D
90+import qualified Streamly.Internal.Data.Stream as D
9191 (repeatM, timesWith, foldAddLazy, map, scanlMAfter', postscanlMAfter'
9292 , postscanlM', take, takeWhile, takeEndBy, drop, findIndices
9393 , fromStreamK, toStreamK, concatMapM, concatMap, foldManyPost, splitOnSeq
src/Streamly/Internal/Data/Stream/IsStream/Eliminate.hs+1−1
@@ -172,7 +172,7 @@ import qualified Streamly.Internal.Data.Fold as FL
172172import qualified Streamly.Internal.Data.Parser as PRD
173173-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK
174174import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
175−import qualified Streamly.Internal.Data.Stream.StreamD as D
175+import qualified Streamly.Internal.Data.Stream as D
176176 (foldr1, foldlT, foldlM', mapM_, null, head, headElse, last, elem
177177 , notElem, all, any, minimum, minimumBy, maximum, maximumBy, the, lookup
178178 , find, findM, toListRev, isPrefixOf, isSubsequenceOf, stripPrefix, (!!)
src/Streamly/Internal/Data/Stream/IsStream/Enumeration.hs+1−1
@@ -65,7 +65,7 @@ import Data.Functor.Identity (Identity(..))
6565import Streamly.Internal.Data.Stream.IsStream.Type (IsStream(..), fromStreamD)
6666
6767import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
68−import qualified Streamly.Internal.Data.Stream.StreamD as D
68+import qualified Streamly.Internal.Data.Stream as D
6969 ( enumerateFromNum
7070 , enumerateFromThenNum
7171 , enumerateFromThenToIntegral
src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+2−2
@@ -178,12 +178,12 @@ import Streamly.Data.Unfold (Unfold)
178178import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
179179import qualified Streamly.Internal.Data.Stream.Parallel as Par
180180import qualified Streamly.Internal.Data.Stream.Serial as Serial
181−import qualified Streamly.Internal.Data.Stream.StreamD as D
181+import qualified Streamly.Internal.Data.Stream as D
182182 (append, interleave, interleaveFstSuffix, interleaveFst, interleaveMin
183183 , roundRobin, mergeByM, unfoldMany, unfoldInterleave, intersperse
184184 , unfoldRoundRobin, interpose, interposeSuffix, gintercalate
185185 , gintercalateSuffix, intersperseMSuffix)
186−import qualified Streamly.Internal.Data.Stream.StreamK as K (mergeBy, mergeByM)
186+import qualified Streamly.Internal.Data.StreamK as K (mergeBy, mergeByM)
187187import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
188188 (interleave, append, mergeMapWith)
189189import qualified Streamly.Internal.Data.Stream.ZipAsync as ZipAsync
src/Streamly/Internal/Data/Stream/IsStream/Generate.hs+1−1
@@ -110,7 +110,7 @@ import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed
110110import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
111111import qualified Streamly.Internal.Data.Stream.Parallel as Par
112112import qualified Streamly.Internal.Data.Stream.Serial as Serial
113−import qualified Streamly.Internal.Data.Stream.StreamD as D
113+import qualified Streamly.Internal.Data.Stream as D
114114 (unfold, unfoldr, toStreamK, unfoldr, repeat, replicate, replicateM
115115 , fromIndices, fromIndicesM, iterate, iterateM, toStreamK, fromListM
116116 , fromListM)
src/Streamly/Internal/Data/Stream/IsStream/Lift.hs+1−1
@@ -34,7 +34,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type
3434 (IsStream(..), fromStreamD, toStreamD)
3535import Streamly.Internal.Data.Stream.Serial (SerialT)
3636
37−import qualified Streamly.Internal.Data.Stream.StreamD as D
37+import qualified Streamly.Internal.Data.Stream as D
3838 (morphInner, liftInner, runReaderT, evalStateT, runStateT)
3939
4040------------------------------------------------------------------------------
src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+1−1
@@ -191,7 +191,7 @@ import qualified Streamly.Internal.Data.Fold as FL
191191import qualified Streamly.Internal.Data.IsMap as IsMap
192192import qualified Streamly.Internal.Data.Parser as PRD (Parser(..))
193193import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
194−import qualified Streamly.Internal.Data.Stream.StreamD as D
194+import qualified Streamly.Internal.Data.Stream as D
195195 ( foldMany
196196 , groupsOf
197197 , refoldMany
src/Streamly/Internal/Data/Stream/IsStream/Top.hs+1−1
@@ -83,7 +83,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Expand as Stream
8383import qualified Streamly.Internal.Data.Stream.IsStream.Reduce as Stream
8484import qualified Streamly.Internal.Data.Stream.IsStream.Transform as Stream
8585import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
86−import qualified Streamly.Internal.Data.Stream.StreamD as StreamD
86+import qualified Streamly.Internal.Data.Stream as StreamD
8787
8888import Prelude hiding (Foldable(..), filter, zipWith, concatMap, concat)
8989
src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+1−1
@@ -256,7 +256,7 @@ import qualified Streamly.Data.Fold as FL
256256import qualified Streamly.Internal.Data.Stream.Concurrent as Concur
257257import qualified Streamly.Internal.Data.Stream.Parallel as Par
258258import qualified Streamly.Internal.Data.Stream.Serial as Serial
259−import qualified Streamly.Internal.Data.Stream.StreamD as D
259+import qualified Streamly.Internal.Data.Stream as D
260260 (transform, foldrT, tap, tapOffsetEvery, mapM, scan
261261 , scanMany, postscan, scanlx', scanlM', scanl', postscanl', prescanl'
262262 , prescanlM', scanl1M', scanl1', filter, filterM, uniq, deleteBy, takeWhileM
src/Streamly/Internal/Data/Stream/IsStream/Type.hs+1−1
@@ -127,7 +127,7 @@ import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
127127 (StreamK(..), cons, fromEffect
128128 , nil, fromPure, bindWith, drain
129129 , fromFoldable, nilM, repeat)
130−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK
130+import qualified Streamly.Internal.Data.StreamK as StreamK
131131import qualified Streamly.Internal.Data.Stream.Serial as Stream
132132 (fromStreamK, toStreamK)
133133import qualified Streamly.Internal.Data.Stream.Zip as Zip
src/Streamly/Internal/Data/Stream/Time.hs+1−1
@@ -78,7 +78,7 @@ import qualified Streamly.Data.Stream as Stream
7878import qualified Streamly.Data.Unfold as Unfold
7979import qualified Streamly.Internal.Data.Fold as Fold (Step(..))
8080import qualified Streamly.Internal.Data.IsMap as IsMap
81−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
81+import qualified Streamly.Internal.Data.Stream as Stream
8282 ( scanlMAfter'
8383 , timeIndexed
8484 , timestamped
src/Streamly/Internal/Data/Stream/Zip.hs+1−1
@@ -50,7 +50,7 @@ import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
5050
5151import qualified Streamly.Internal.Data.Stream.Common as P
5252import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
53−import qualified Streamly.Internal.Data.Stream.StreamD as D
53+import qualified Streamly.Internal.Data.Stream as D
5454import qualified Streamly.Internal.Data.Stream.Serial as Serial
5555
5656import Prelude hiding (map, repeat, zipWith)
src/Streamly/Internal/Data/Stream/Zip/Concurrent.hs+2−2
@@ -18,10 +18,10 @@ module Streamly.Internal.Data.Stream.Zip.Concurrent
1818 )
1919where
2020
21−import Streamly.Internal.Data.Stream.StreamD (Stream)
21+import Streamly.Internal.Data.Stream (Stream)
2222import Streamly.Internal.Data.Stream.Concurrent (MonadAsync, parZipWith)
2323
24−import qualified Streamly.Internal.Data.Stream.StreamD as Stream (repeat)
24+import qualified Streamly.Internal.Data.Stream as Stream (repeat)
2525import Prelude hiding (map, repeat, zipWith)
2626
2727-- $setup
src/Streamly/Internal/Data/Stream/ZipAsync.hs+2−2
@@ -25,9 +25,9 @@ where
2525import Streamly.Internal.Control.Concurrent (MonadAsync)
2626import Streamly.Internal.Data.Stream.StreamK.Type (Stream)
2727
28−import qualified Streamly.Internal.Data.Stream.StreamK as K
28+import qualified Streamly.Internal.Data.StreamK as K
2929 (mkStream, foldStream, zipWithM, consM)
30−import qualified Streamly.Internal.Data.Stream.StreamD as D (fromStreamK)
30+import qualified Streamly.Internal.Data.Stream as D (fromStreamK)
3131import qualified Streamly.Internal.Data.Stream.Serial as Serial
3232import qualified Streamly.Internal.Data.Stream.SVar.Eliminate as SVar
3333import qualified Streamly.Internal.Data.Stream.SVar.Generate as SVar
src/Streamly/Internal/FileSystem/Event.hs+1−1
@@ -48,7 +48,7 @@ where
4848import Data.List.NonEmpty (NonEmpty)
4949import Data.Word (Word8)
5050import Streamly.Internal.Data.Array (Array)
51−import Streamly.Internal.Data.Stream.StreamD (Stream)
51+import Streamly.Internal.Data.Stream (Stream)
5252
5353#if defined(CABAL_OS_DARWIN)
5454import Streamly.Internal.FileSystem.Event.Darwin (Event)
src/Streamly/Internal/FileSystem/Event/Linux.hs+2−2
@@ -171,7 +171,7 @@ import Foreign.Storable (peek, peekByteOff, sizeOf)
171171import GHC.IO.Device (IODeviceType(Stream))
172172import GHC.IO.FD (fdFD, mkFD)
173173import GHC.IO.Handle.FD (mkHandleFromFD)
174−import Streamly.Internal.Data.Stream.StreamD (Stream)
174+import Streamly.Internal.Data.Stream (Stream)
175175import Streamly.Internal.Data.Parser (Parser)
176176import Streamly.Internal.Data.Array.Type (Array(..), byteLength)
177177import System.Directory (doesDirectoryExist)
@@ -184,7 +184,7 @@ import qualified Streamly.Internal.Data.Array as A
184184import qualified Streamly.Data.Fold as FL
185185import qualified Streamly.Internal.Data.Parser as PR
186186 (takeEQ, fromEffect, fromFold)
187−import qualified Streamly.Internal.Data.Stream.StreamD as S
187+import qualified Streamly.Internal.Data.Stream as S
188188import qualified Streamly.Internal.FileSystem.Dir as Dir
189189import qualified Streamly.Internal.FileSystem.Handle as FH
190190import qualified Streamly.Internal.Unicode.Stream as U
src/Streamly/Internal/FileSystem/FD.hs+1−1
@@ -148,7 +148,7 @@ import qualified Streamly.Data.Fold as FL
148148import qualified Streamly.Internal.Data.Array.Mut as MArray
149149 (MutArray(..), newPinnedBytes, asPtrUnsafe)
150150import qualified Streamly.Internal.Data.Stream.Chunked as AS
151−import qualified Streamly.Internal.Data.Stream.StreamD as S
151+import qualified Streamly.Internal.Data.Stream as S
152152import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
153153 (Stream(..), Step(..))
154154import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)
src/Streamly/Internal/Network/Inet/TCP.hs+1−1
@@ -124,7 +124,7 @@ import qualified Streamly.Data.Unfold as UF
124124import qualified Streamly.Internal.Data.Array.Type as A
125125import qualified Streamly.Internal.Data.Unfold as UF (first, bracketIO)
126126import qualified Streamly.Internal.Data.Fold.Type as FL (Step(..), reduce)
127−import qualified Streamly.Internal.Data.Stream.StreamD as S
127+import qualified Streamly.Internal.Data.Stream as S
128128import qualified Streamly.Internal.Data.Stream.Exception.Lifted as S
129129import qualified Streamly.Internal.Network.Socket as ISK
130130
src/Streamly/Internal/Network/Socket.hs+1−1
@@ -100,7 +100,7 @@ import qualified Streamly.Internal.Data.Array.Type as A
100100 (unsafeFreeze, asPtrUnsafe, byteLength, writeNUnsafe, chunksOf)
101101import qualified Streamly.Internal.Data.Array.Mut as MArray
102102 (MutArray(..), newPinnedBytes, asPtrUnsafe)
103−import qualified Streamly.Internal.Data.Stream.StreamD as S
103+import qualified Streamly.Internal.Data.Stream as S
104104import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
105105 (Stream(..), Step(..))
106106import qualified Streamly.Data.Unfold as UF
src/Streamly/Internal/System/IOVec.hs+1−1
@@ -36,7 +36,7 @@ import Streamly.Internal.Data.Array.Mut.Type (Array(..))
3636
3737import qualified Streamly.Internal.Data.Array.Type as Array
3838import qualified Streamly.Internal.Data.Array.Mut.Type as MArray
39−import qualified Streamly.Internal.Data.Stream.StreamD as D
39+import qualified Streamly.Internal.Data.Stream as D
4040-}
4141#endif
4242
src/Streamly/Internal/Unicode/Char.hs+2−2
@@ -35,9 +35,9 @@ where
3535
3636import Data.Char (isAsciiUpper, isAsciiLower, chr, ord)
3737import Unicode.Char (DecomposeMode(..))
38−import Streamly.Internal.Data.Stream.StreamD (Stream(..), Step (..))
38+import Streamly.Internal.Data.Stream (Stream(..), Step (..))
3939
40−import qualified Streamly.Internal.Data.Stream.StreamD as Stream (Stream)
40+import qualified Streamly.Internal.Data.Stream as Stream (Stream)
4141
4242import qualified Unicode.Char as Char
4343
test/Streamly/Test/Data/Parser/ParserD.hs+1−1
@@ -20,7 +20,7 @@ import qualified Streamly.Internal.Data.Parser as P
2020import qualified Streamly.Internal.Data.Producer.Source as Source
2121import qualified Streamly.Internal.Data.Producer as Producer
2222import qualified Streamly.Internal.Data.Stream as S
23−import qualified Streamly.Internal.Data.Stream.StreamD as D
23+import qualified Streamly.Internal.Data.Stream as D
2424import qualified Streamly.Internal.Data.Unfold as Unfold
2525import qualified Test.Hspec as H
2626
test/Streamly/Test/Data/Unfold.hs+2−2
@@ -16,8 +16,8 @@ import qualified Prelude
1616import qualified Streamly.Internal.Data.Fold as Fold
1717import qualified Streamly.Internal.Data.Unfold as UF
1818import qualified Streamly.Internal.Data.Stream as S
19−import qualified Streamly.Internal.Data.Stream.StreamD as D
20−import qualified Streamly.Internal.Data.Stream.StreamK as K
19+import qualified Streamly.Internal.Data.Stream as D
20+import qualified Streamly.Internal.Data.StreamK as K
2121
2222import Control.Monad.Trans.State.Strict
2323import Data.Functor.Identity
test/Streamly/Test/Prelude/Serial.hs+1−1
@@ -49,7 +49,7 @@ import qualified Streamly.Data.Stream.Prelude as S
4949import qualified Streamly.Internal.Data.Fold as FL
5050import qualified Streamly.Internal.Data.Unfold as UF
5151import qualified Streamly.Internal.Data.Stream as IS
52−import qualified Streamly.Internal.Data.Stream.StreamK as K
52+import qualified Streamly.Internal.Data.StreamK as K
5353import qualified Streamly.Data.Array as A
5454import qualified Streamly.Internal.Data.Parser as Parser
5555import qualified Streamly.Prelude as SP
test/Streamly/Test/Unicode/Stream.hs+1−1
@@ -21,7 +21,7 @@ import Test.QuickCheck.Monadic (run, monadicIO, assert)
2121import qualified Streamly.Data.Array as A
2222import qualified Streamly.Data.Stream as Stream
2323import qualified Streamly.Internal.Data.Stream.Chunked as AS
24−import qualified Streamly.Internal.Data.Stream.StreamD as Stream
24+import qualified Streamly.Internal.Data.Stream as Stream
2525import qualified Streamly.Unicode.Stream as SS
2626import qualified Streamly.Internal.Unicode.Stream as IUS
2727import qualified Streamly.Internal.Unicode.Array as IUA