7432dda · streamly · git.iko.soy

benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs+1−1

compare with master

unifiedsplit

@@ -7,7 +7,7 @@ import System.Random (randomRIO)

7

8import qualified Streamly.Data.Fold as Fold

9import 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

11

12import Gauge

13import 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)

47import qualified Streamly.Internal.Data.Array as Array

48import qualified Streamly.Internal.Data.Array.Mut as MArray

49import 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

51

52import Gauge

53import Streamly.Benchmark.Common hiding (benchPureSrc)

benchmark/Streamly/Benchmark/Data/Array/Stream.hs+4−4

@@ -31,8 +31,8 @@ import Control.Monad.Catch (MonadCatch)

31import Data.Functor.Identity (runIdentity)

32import Data.Maybe (isJust)

33import Data.Word (Word8)

34−import Streamly.Internal.Data.Stream.StreamD (Stream)

34+import Streamly.Internal.Data.Stream (Stream)

35−import Streamly.Internal.Data.Stream.StreamK (StreamK)

35+import Streamly.Internal.Data.StreamK (StreamK)

36import System.IO (Handle)

37import System.Random (randomRIO)

38import Prelude hiding ()

@@ -42,8 +42,8 @@ import qualified Streamly.Internal.Data.Array as Array

42import qualified Streamly.Internal.Data.Stream.Chunked as ArrayStream

43import qualified Streamly.Internal.Data.Fold as Fold

44import qualified Streamly.Internal.Data.Parser as Parser

45−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

45+import qualified Streamly.Internal.Data.Stream as Stream

46−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

46+import qualified Streamly.Internal.Data.StreamK as StreamK

47import qualified Streamly.Internal.FileSystem.Handle as Handle

48import qualified Streamly.Internal.Unicode.Stream as Unicode

49

benchmark/Streamly/Benchmark/Data/Fold.hs+2−2

@@ -25,7 +25,7 @@ import Data.IntMap.Strict (IntMap)

25import Data.Monoid (Last(..), Sum(..))

26import System.Random (randomRIO)

27

28−import Streamly.Internal.Data.Stream.StreamD (Stream)

28+import Streamly.Internal.Data.Stream (Stream)

29import Streamly.Internal.Data.Fold (Fold(..))

30import Streamly.Internal.Data.IsMap.HashMap ()

31import Streamly.Internal.Data.Array.Mut (MutArray)

@@ -35,7 +35,7 @@ import qualified Streamly.Data.Fold.Prelude as Fold

35import qualified Streamly.Internal.Data.Fold.Container as FL

36import qualified Streamly.Internal.Data.Unfold as Unfold

37import 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

39

40import Gauge

41import Streamly.Benchmark.Common

benchmark/Streamly/Benchmark/Data/Fold/Window.hs+2−2

@@ -4,13 +4,13 @@ module Main (main) where

4

5import Control.DeepSeq (NFData)

6import Streamly.Data.Fold (Fold)

7−import Streamly.Internal.Data.Stream.StreamD (Stream)

7+import Streamly.Internal.Data.Stream (Stream)

8import System.Random (randomRIO)

9

10import qualified Streamly.Data.Fold as Fold

11import qualified Streamly.Internal.Data.Ring.Unboxed as Ring

12import 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

14

15import Streamly.Benchmark.Common

16import Gauge

benchmark/Streamly/Benchmark/Data/Parser.hs+2−2

@@ -34,7 +34,7 @@ import System.Random (randomRIO)

34import Streamly.Internal.Data.Fold (Fold(..))

35import Streamly.Internal.Data.Parser

36 (ParseError(..), Parser(..), Initial(..), Step(..))

37−import Streamly.Internal.Data.Stream.StreamD (Stream)

37+import Streamly.Internal.Data.Stream (Stream)

38import Prelude hiding

39 (any, all, take, sequence, sequence_, sequenceA, takeWhile, dropWhile, span)

40

@@ -48,7 +48,7 @@ import qualified Streamly.Internal.Data.Parser as PR

48import qualified Streamly.Data.Stream as Stream

49import qualified Streamly.Internal.Data.Producer as Producer

50import 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

52

53import Gauge hiding (env)

54import Streamly.Benchmark.Common

benchmark/Streamly/Benchmark/Data/Parser/ParserK.hs+2−2

@@ -23,7 +23,7 @@ import Streamly.Internal.Data.Fold.Type (Fold(..))

23import Streamly.Data.StreamK (StreamK)

24import Streamly.Internal.Data.Parser

25 (ParseError(..), Parser(..), Initial(..), Step(..))

26−import Streamly.Internal.Data.Stream.StreamD (Stream)

26+import Streamly.Internal.Data.Stream (Stream)

27import System.Random (randomRIO)

28import Prelude hiding

29 (any, all, take, sequence, sequence_, sequenceA, takeWhile)

@@ -36,7 +36,7 @@ import qualified Streamly.Data.Fold as FL

36import qualified Streamly.Internal.Data.Fold as Fold

37import qualified Streamly.Data.Parser as PRD

38import 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

40

41import Gauge

42import Streamly.Benchmark.Common

benchmark/Streamly/Benchmark/Data/Stream.hs+1−1

@@ -36,7 +36,7 @@ import Streamly.Benchmark.Common

36#ifdef FUSION_CHECK

37import Data.Function ((&))

38import Streamly.Data.Stream (Stream)

39−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

39+import qualified Streamly.Internal.Data.Stream as Stream

40import qualified Streamly.Internal.Data.Fold as Fold

41import qualified Data.Foldable as Foldable

42import Stream.Common

benchmark/Streamly/Benchmark/Data/Stream/Common.hs+7−7

@@ -90,15 +90,15 @@ import Streamly.Benchmark.Prelude

90 , concatStreamsWith

91 )

92#else

93−import Streamly.Internal.Data.Stream.StreamD (Stream)

93+import Streamly.Internal.Data.Stream (Stream)

94−import qualified Streamly.Internal.Data.Stream.StreamD as D

94+import qualified Streamly.Internal.Data.Stream as D

95#ifdef USE_STREAMK

96−import Streamly.Internal.Data.Stream.StreamK (StreamK)

96+import Streamly.Internal.Data.StreamK (StreamK)

97−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

97+import qualified Streamly.Internal.Data.Stream as Stream

98−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

98+import qualified Streamly.Internal.Data.StreamK as StreamK

99#else

100−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

100+import qualified Streamly.Internal.Data.Stream as Stream

101−import qualified Streamly.Internal.Data.Stream.StreamD as StreamK

101+import qualified Streamly.Internal.Data.Stream as StreamK

102#endif

103#endif

104

benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hs+5−5

@@ -37,7 +37,7 @@ import qualified Streamly.Internal.Data.Fold as Fold

37#ifdef INSPECTION

38import GHC.Types (SPEC(..))

39import Test.Inspection

40−import qualified Streamly.Internal.Data.Stream.StreamD as D

40+import qualified Streamly.Internal.Data.Stream as D

41#endif

42

43#ifdef USE_PRELUDE

@@ -47,13 +47,13 @@ import qualified Streamly.Internal.Data.Stream.IsStream as S

47import qualified Streamly.Internal.Data.Stream.IsStream as StreamK

48#else

49import Stream.Common

50−import Streamly.Internal.Data.Stream.StreamD (Stream)

50+import Streamly.Internal.Data.Stream (Stream)

51−import qualified Streamly.Internal.Data.Stream.StreamD as S

51+import qualified Streamly.Internal.Data.Stream as S

52#ifdef USE_STREAMK

53−import Streamly.Internal.Data.Stream.StreamK (StreamK)

53+import Streamly.Internal.Data.StreamK (StreamK)

54import qualified Streamly.Data.StreamK as StreamK

55#else

56−import qualified Streamly.Internal.Data.Stream.StreamD as StreamK

56+import qualified Streamly.Internal.Data.Stream as StreamK

57#endif

58#endif

59

benchmark/Streamly/Benchmark/Data/Stream/Exceptions.hs+2−2

@@ -41,7 +41,7 @@ import qualified Streamly.Internal.Data.Unfold.Exception as IUF

41#ifdef USE_PRELUDE

42import qualified Streamly.Internal.Data.Stream.IsStream as Stream

43#else

44−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

44+import qualified Streamly.Internal.Data.Stream as Stream

45import qualified Streamly.Internal.Data.Stream.Exception.Lifted as Stream

46#endif

47

@@ -53,7 +53,7 @@ import Streamly.Benchmark.Common.Handle

53#ifdef INSPECTION

54import Test.Inspection

55

56−import qualified Streamly.Internal.Data.Stream.StreamD as D

56+import qualified Streamly.Internal.Data.Stream as D

57#endif

58

59#ifdef USE_PRELUDE

benchmark/Streamly/Benchmark/Data/Stream/Expand.hs+6−6

@@ -29,7 +29,7 @@ module Stream.Expand (benchmarks) where

29import GHC.Types (SPEC(..))

30import Test.Inspection

31

32−import qualified Streamly.Internal.Data.Stream.StreamD as D

32+import qualified Streamly.Internal.Data.Stream as D

33#endif

34

35import qualified Stream.Common as Common

@@ -42,15 +42,15 @@ import Streamly.Benchmark.Prelude

42 ( sourceFoldMapM, sourceFoldMapWith, sourceFoldMapWithM

43 , sourceFoldMapWithStream, concatFoldableWith, concatForFoldableWith)

44#else

45−import qualified Streamly.Internal.Data.Stream.StreamD as S

45+import qualified Streamly.Internal.Data.Stream as S

46#ifdef USE_STREAMK

47−import Streamly.Internal.Data.Stream.StreamD (Stream)

47+import Streamly.Internal.Data.Stream (Stream)

48−import Streamly.Internal.Data.Stream.StreamK (StreamK, CrossStreamK)

48+import Streamly.Internal.Data.StreamK (StreamK, CrossStreamK)

49import qualified Control.Applicative as AP

50import 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

52#else

53−import qualified Streamly.Internal.Data.Stream.StreamD as StreamK

53+import qualified Streamly.Internal.Data.Stream as StreamK

54#endif

55#endif

56

benchmark/Streamly/Benchmark/Data/Stream/Generate.hs+3−3

@@ -31,11 +31,11 @@ import qualified Streamly.Prelude as S

31import qualified Streamly.Internal.Data.Stream.IsStream as Stream

32#else

33import Stream.Common

34−import Streamly.Internal.Data.Stream.StreamD (Stream)

34+import Streamly.Internal.Data.Stream (Stream)

35−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

35+import qualified Streamly.Internal.Data.Stream as Stream

36#ifdef USE_STREAMK

37import System.IO.Unsafe (unsafeInterleaveIO)

38−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

38+import qualified Streamly.Internal.Data.StreamK as StreamK

39import qualified Stream.Common as Common

40#endif

41#endif

benchmark/Streamly/Benchmark/Data/Stream/Lift.hs+4−4

@@ -27,12 +27,12 @@ import qualified Streamly.Internal.Data.Fold as Fold

27#ifdef USE_PRELUDE

28import qualified Streamly.Internal.Data.Stream.IsStream as Stream

29#else

30−import Streamly.Internal.Data.Stream.StreamD (Stream)

30+import Streamly.Internal.Data.Stream (Stream)

31−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

31+import qualified Streamly.Internal.Data.Stream as Stream

32#ifdef USE_STREAMK

33import Stream.Common (benchIO, drain)

34−import Streamly.Internal.Data.Stream.StreamK (StreamK)

34+import Streamly.Internal.Data.StreamK (StreamK)

35−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

35+import qualified Streamly.Internal.Data.StreamK as StreamK

36import qualified Control.Monad.State.Strict as State

37#endif

38#endif

benchmark/Streamly/Benchmark/Data/Stream/Reduce.hs+5−5

@@ -44,19 +44,19 @@ import Streamly.Benchmark.Prelude hiding

44 , transformComposeMapM, transformTeeMapM, transformZipMapM)

45#else

46

47−import Streamly.Internal.Data.Stream.StreamD (Stream)

47+import Streamly.Internal.Data.Stream (Stream)

48−import qualified Streamly.Internal.Data.Stream.StreamD as S

48+import qualified Streamly.Internal.Data.Stream as S

49#ifndef USE_STREAMLY_CORE

50import qualified Streamly.Data.Stream.Prelude as S

51import qualified Streamly.Internal.Data.Stream.Time as S

52#endif

53

54#ifdef USE_STREAMK

55−import Streamly.Internal.Data.Stream.StreamK (StreamK)

55+import Streamly.Internal.Data.StreamK (StreamK)

56import 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

58#else

59−import qualified Streamly.Internal.Data.Stream.StreamD as K

59+import qualified Streamly.Internal.Data.Stream as K

60#endif

61

62#endif

benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs+1−1

@@ -30,7 +30,7 @@ import System.Random (randomRIO)

30import Prelude hiding (tail, mapM_, foldl, last, map, mapM, concatMap, zip)

31

32import qualified Prelude as P

33−import qualified Streamly.Internal.Data.Stream.StreamD as S

33+import qualified Streamly.Internal.Data.Stream as S

34import qualified Streamly.Internal.Data.Unfold as UF

35import qualified Streamly.Internal.Data.Fold as FL

36

benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs+1−1

@@ -34,7 +34,7 @@ import qualified Prelude as P

34import qualified Data.List as List

35

36import 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

38

39import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)

40

benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs+2−2

@@ -34,8 +34,8 @@ import qualified Prelude as P

34-- import qualified Data.List as List

35

36import 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

38−import qualified Streamly.Internal.Data.Stream.StreamD as D

38+import qualified Streamly.Internal.Data.Stream as D

39import qualified Streamly.Internal.Data.Fold as Fold

40

41import 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

43import qualified Streamly.Internal.Data.Stream.IsStream as Stream

44import Streamly.Internal.Data.Time.Units

45#else

46−import Streamly.Internal.Data.Stream.StreamD (Stream)

46+import Streamly.Internal.Data.Stream (Stream)

47−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

47+import qualified Streamly.Internal.Data.Stream as Stream

48#ifndef USE_STREAMLY_CORE

49import qualified Streamly.Internal.Data.Stream.Time as Stream

50#endif

@@ -53,8 +53,8 @@ import Control.DeepSeq (NFData(..))

53import Data.Functor.Identity (Identity(..))

54import qualified Prelude

55import qualified Streamly.Internal.Data.Fold as Fold

56−import Streamly.Internal.Data.Stream.StreamK (StreamK)

56+import Streamly.Internal.Data.StreamK (StreamK)

57−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

57+import qualified Streamly.Internal.Data.StreamK as StreamK

58#endif

59#endif

60

benchmark/Streamly/Benchmark/Data/Unfold.hs+3−3

@@ -32,9 +32,9 @@ import qualified Streamly.FileSystem.Handle as FH

32import qualified Streamly.Internal.Data.Fold as FL

33import qualified Streamly.Internal.Data.Unfold as UF

34import qualified Streamly.Internal.Data.Unfold.Exception as UF

35−import qualified Streamly.Internal.Data.Stream.StreamD as S

35+import qualified Streamly.Internal.Data.Stream as S

36−import qualified Streamly.Internal.Data.Stream.StreamD as D

36+import qualified Streamly.Internal.Data.Stream as D

37−import qualified Streamly.Internal.Data.Stream.StreamK as K

37+import qualified Streamly.Internal.Data.StreamK as K

38

39import Gauge hiding (env)

40import 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

35import qualified Streamly.Internal.Data.Array as A

36import qualified Streamly.Internal.Data.Array.Type as AT

37import 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

39import qualified Streamly.Internal.FileSystem.Handle as IFH

40import qualified Streamly.Internal.Unicode.Stream as IUS

41import qualified Streamly.Data.Stream.Prelude as S

@@ -49,7 +49,7 @@ import Streamly.Benchmark.Common.Handle

49import Streamly.Internal.Data.Stream.StreamD.Type (Step(..), FoldMany)

50

51import 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

53import qualified Streamly.Internal.Data.Unfold as IUF

54

55import Test.Inspection

benchmark/Streamly/Benchmark/Prelude/Merge.hs+1−1

@@ -36,7 +36,7 @@ import Gauge

36import GHC.Types (SPEC(..))

37import Test.Inspection

38

39−import qualified Streamly.Internal.Data.Stream.StreamD as D

39+import qualified Streamly.Internal.Data.Stream as D

40#endif

41

42moduleName :: String

benchmark/Streamly/Benchmark/Prelude/WSerial.hs+1−1

@@ -35,7 +35,7 @@ import Gauge

35import GHC.Types (SPEC(..))

36import Test.Inspection

37

38−import qualified Streamly.Internal.Data.Stream.StreamD as D

38+import qualified Streamly.Internal.Data.Stream as D

39#endif

40

41moduleName :: String

benchmark/Streamly/Benchmark/Prelude/ZipSerial.hs+1−1

@@ -35,7 +35,7 @@ import Gauge

35import GHC.Types (SPEC(..))

36import Test.Inspection

37

38−import qualified Streamly.Internal.Data.Stream.StreamD as D

38+import qualified Streamly.Internal.Data.Stream as D

39#endif

40

41moduleName :: String

benchmark/Streamly/Benchmark/Unicode/Char.hs+1−1

@@ -24,7 +24,7 @@ import Streamly.Internal.Unicode.Char

24import Streamly.Benchmark.Common (o_1_space_prefix)

25

26import 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

28import qualified System.Directory as Dir

29

30--------------------------------------------------------------------------------

benchmark/Streamly/Benchmark/Unicode/Stream.hs+1−1

@@ -27,7 +27,7 @@ import System.IO (Handle)

27

28import qualified Streamly.Data.Array as Array

29import 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

31import qualified Streamly.Internal.Data.Unfold as Unfold

32import qualified Streamly.Internal.FileSystem.Handle as Handle

33import 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)

54import System.Random (randomRIO)

55

56import 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

58

59import Gauge

60

core/src/DocTestDataStreamK.hs+1−1

@@ -16,6 +16,6 @@

16

17For APIs that have not been released yet.

18

19−>>> import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

19+>>> import qualified Streamly.Internal.Data.StreamK as StreamK

20>>> import qualified Streamly.Internal.FileSystem.Dir as Dir

21-}

core/src/Streamly/Data/Stream.hs+4−4

@@ -497,10 +497,7 @@ where

497import Control.Monad.IO.Class (MonadIO)

498import Data.Word (Word8)

499import Streamly.Data.Array (Array)

500−

501−import qualified Streamly.Internal.Data.Array.Type as Array

500+import Streamly.Internal.Data.Stream

502−import qualified Streamly.Internal.Data.Stream.Chunked as ArrayStream

503−import Streamly.Internal.Data.Stream.StreamD

504import Prelude

501import Prelude

505 hiding (filter, drop, dropWhile, take, takeWhile, zipWith, foldr,

502 hiding (filter, drop, dropWhile, take, takeWhile, zipWith, foldr,

506 foldl, map, mapM, mapM_, sequence, all, any, sum, product, elem,

503 foldl, map, mapM, mapM_, sequence, all, any, sum, product, elem,

@@ -508,6 +505,9 @@ import Prelude

508 reverse, iterate, init, and, or, lookup, foldr1, (!!),

505 reverse, iterate, init, and, or, lookup, foldr1, (!!),

509 scanl, scanl1, repeat, replicate, concatMap, span)

506 scanl, scanl1, repeat, replicate, concatMap, span)

510

507

508+import qualified Streamly.Internal.Data.Array.Type as Array

509+import qualified Streamly.Internal.Data.Stream.Chunked as ArrayStream

510+

511#include "DocTestDataStream.hs"

512

513-- $overview

core/src/Streamly/Data/StreamK.hs+2−2

@@ -12,7 +12,7 @@

12-- section in the "Streamly.Data.Stream" module to know when to use this

13-- module.

14--

15−-- Please refer to "Streamly.Internal.Data.Stream.StreamK" for more functions

15+-- Please refer to "Streamly.Internal.Data.StreamK" for more functions

16-- that have not yet been released.

17--

18-- Some useful idioms:

@@ -125,7 +125,7 @@ module Streamly.Data.StreamK

125 )

126where

127

128−import Streamly.Internal.Data.Stream.StreamK

128+import Streamly.Internal.Data.StreamK

129import Prelude hiding (reverse, zipWith, mapM, dropWhile, take)

130

131#include "DocTestDataStreamK.hs"

core/src/Streamly/Internal/Console/Stdio.hs+2−2

@@ -47,12 +47,12 @@ import System.IO (stdin, stdout, stderr)

47import Prelude hiding (read)

48

49import Streamly.Internal.Data.Array.Type (Array(..))

50−import Streamly.Internal.Data.Stream.StreamD (Stream)

50+import Streamly.Internal.Data.Stream (Stream)

51import Streamly.Internal.Data.Unfold (Unfold)

52import Streamly.Internal.Data.Fold (Fold)

53

54import 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

56 (intersperseMSuffix)

57import qualified Streamly.Internal.Data.Unfold as Unfold

58import 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

126 (Array(..), length, asPtrUnsafe)

127import Streamly.Internal.Data.Fold.Type (Fold(..))

128import Streamly.Internal.Data.Producer.Type (Producer(..))

129−import Streamly.Internal.Data.Stream.StreamD (Stream)

129+import Streamly.Internal.Data.Stream (Stream)

130import Streamly.Internal.Data.Tuple.Strict (Tuple3Fused'(..))

131import Streamly.Internal.Data.Unfold.Type (Unfold(..))

132import Streamly.Internal.System.IO (unsafeInlineIO)

@@ -138,8 +138,8 @@ import qualified Streamly.Internal.Data.Fold as FL

138import qualified Streamly.Internal.Data.Producer.Type as Producer

139import qualified Streamly.Internal.Data.Producer as Producer

140import qualified Streamly.Internal.Data.Ring.Unboxed as RB

141−import qualified Streamly.Internal.Data.Stream.StreamD as D

141+import qualified Streamly.Internal.Data.Stream as D

142−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

142+import qualified Streamly.Internal.Data.Stream as Stream

143import qualified Streamly.Internal.Data.Unfold as Unfold

144

145#include "DocTestDataArray.hs"

core/src/Streamly/Internal/Data/Array/Mut.hs+2−2

@@ -20,10 +20,10 @@ where

20

21import Control.Monad.IO.Class (MonadIO(..))

22import Streamly.Internal.Data.Unbox (Unbox)

23−import Streamly.Internal.Data.Stream.StreamD (Stream)

23+import Streamly.Internal.Data.Stream (Stream)

24import Streamly.Internal.Data.Unfold.Type (Unfold(..))

25

26−import qualified Streamly.Internal.Data.Stream.StreamD as D

26+import qualified Streamly.Internal.Data.Stream as D

27import qualified Streamly.Internal.Data.Unfold as Unfold

28

29import 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'(..))

40

41import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

42import qualified Streamly.Internal.Data.Fold.Type as FL

43−import qualified Streamly.Internal.Data.Stream.StreamD as D

44import qualified Streamly.Internal.Data.Parser as ParserD

43import qualified Streamly.Internal.Data.Parser as ParserD

44+import qualified Streamly.Internal.Data.Stream as D

45

46-- | @chunksOf n stream@ groups the elements in the input stream into arrays of

47-- @n@ elements each.

core/src/Streamly/Internal/Data/Pipe.hs+2−2

@@ -256,8 +256,8 @@ import Streamly.Internal.Data.Pipe.Type

256

257-- import qualified Streamly.Internal.Data.Array.Type as A

258-- import qualified Streamly.Data.Stream as S

259−-- import qualified Streamly.Internal.Data.Stream.StreamD as D

259+-- import qualified Streamly.Internal.Data.Stream as D

260−-- import qualified Streamly.Internal.Data.Stream.StreamK as K

260+-- import qualified Streamly.Internal.Data.StreamK as K

261-- import qualified Streamly.Internal.Data.Stream.Common as P

262

263------------------------------------------------------------------------------

core/src/Streamly/Internal/Data/Stream.hs+31−3

@@ -1,14 +1,42 @@

1-- |

2-- Module : Streamly.Internal.Data.Stream

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8--

9+-- Direct style re-implementation of CPS stream in

10+-- "Streamly.Internal.Data.StreamK". The symbol or suffix 'D' in this

11+-- module denotes the "Direct" style. GHC is able to INLINE and fuse direct

12+-- style better, providing better performance than CPS implementation.

13+--

14+-- @

15+-- import qualified Streamly.Internal.Data.Stream as D

16+-- @

17+

9module Streamly.Internal.Data.Stream

18module Streamly.Internal.Data.Stream

19+ (

20+ module Streamly.Internal.Data.Stream.StreamD.Type

21+ , module Streamly.Internal.Data.Stream.StreamD.Generate

22+ , module Streamly.Internal.Data.Stream.StreamD.Eliminate

23+ , module Streamly.Internal.Data.Stream.StreamD.Exception

24+ , module Streamly.Internal.Data.Stream.StreamD.Lift

25+ , module Streamly.Internal.Data.Stream.StreamD.Transformer

26+ , module Streamly.Internal.Data.Stream.StreamD.Nesting

27+ , module Streamly.Internal.Data.Stream.StreamD.Transform

10− ( module Streamly.Internal.Data.Stream.StreamD

28+ , module Streamly.Internal.Data.Stream.StreamD.Top

29+ , module Streamly.Internal.Data.Stream.StreamD.Container

11 )

30 )

12where

31where

13

32

14−import Streamly.Internal.Data.Stream.StreamD

33+import Streamly.Internal.Data.Stream.StreamD.Type

34+import Streamly.Internal.Data.Stream.StreamD.Generate

35+import Streamly.Internal.Data.Stream.StreamD.Eliminate

36+import Streamly.Internal.Data.Stream.StreamD.Exception

37+import Streamly.Internal.Data.Stream.StreamD.Lift

38+import Streamly.Internal.Data.Stream.StreamD.Transformer

39+import Streamly.Internal.Data.Stream.StreamD.Nesting

40+import Streamly.Internal.Data.Stream.StreamD.Transform

41+import Streamly.Internal.Data.Stream.StreamD.Top

42+import Streamly.Internal.Data.Stream.StreamD.Container

core/src/Streamly/Internal/Data/Stream/Bottom.hs+2−2

@@ -79,8 +79,8 @@ import Streamly.Internal.Data.SVar.Type (defState)

79

80import qualified Streamly.Internal.Data.Array.Type as A

81import qualified Streamly.Internal.Data.Fold as Fold

82−import qualified Streamly.Internal.Data.Stream.StreamK as K

82+import qualified Streamly.Internal.Data.StreamK as K

83−import qualified Streamly.Internal.Data.Stream.StreamD as D

83+import qualified Streamly.Internal.Data.Stream as D

84

85import Prelude hiding (take, takeWhile, drop, reverse, concatMap, map, zipWith)

86

core/src/Streamly/Internal/Data/Stream/Chunked.hs+4−4

@@ -80,8 +80,8 @@ import Streamly.Internal.Data.Array.Type (Array(..))

80import Streamly.Internal.Data.Array.Mut.Type (MutArray)

81import Streamly.Internal.Data.Fold.Chunked (ChunkFold(..))

82import Streamly.Internal.Data.Parser (ParseError(..))

83−import Streamly.Internal.Data.Stream.StreamD (Stream)

83+import Streamly.Internal.Data.Stream (Stream)

84−import Streamly.Internal.Data.Stream.StreamK (StreamK, fromStream, toStream)

84+import Streamly.Internal.Data.StreamK (StreamK, fromStream, toStream)

85import Streamly.Internal.Data.SVar.Type (adaptState, defState)

86import Streamly.Internal.Data.Array.Mut.Type

87 (allocBytesToElemCount)

@@ -97,8 +97,8 @@ import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))

97import qualified Streamly.Internal.Data.Parser as PR

98import qualified Streamly.Internal.Data.Parser as PRD

99 (Parser(..), Initial(..))

100−import qualified Streamly.Internal.Data.Stream.StreamD as D

100+import qualified Streamly.Internal.Data.Stream as D

101−import qualified Streamly.Internal.Data.Stream.StreamK as K

101+import qualified Streamly.Internal.Data.StreamK as K

102

103-- XXX Since these are immutable arrays MonadIO constraint can be removed from

104-- 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

87import qualified Streamly.Internal.Data.Fold as Fold

88import qualified Streamly.Internal.Data.Parser as PRD

89import 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

91import 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

93

94import Streamly.Internal.Data.Stream.Bottom

95import 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)

27import Control.Monad.IO.Class (MonadIO)

28import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)

29

30−import qualified Streamly.Internal.Data.Stream.StreamD as D

30+import qualified Streamly.Internal.Data.Stream as D

31

32-- $setup

33-- >>> :m

core/src/Streamly/Internal/Data/Stream/Expand.hs+2−2

@@ -147,8 +147,8 @@ import Streamly.Internal.Data.Stream.Type

147 , bindWith, concatMapWith, cons, nil)

148import Streamly.Internal.Data.Unfold.Type (Unfold)

149

150−import qualified Streamly.Internal.Data.Stream.StreamD as D

150+import qualified Streamly.Internal.Data.Stream as D

151−import qualified Streamly.Internal.Data.Stream.StreamK as K (mergeBy, mergeByM)

151+import qualified Streamly.Internal.Data.StreamK as K (mergeBy, mergeByM)

152import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

153

154import 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)

84

85import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

86import 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

88import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

89import qualified Streamly.Internal.Data.Stream.Type as Stream

90import 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 (..))

23import Streamly.Internal.Data.Stream.Type

24 (Stream, fromStreamD, toStreamD, fromStreamK, toStreamK)

25

26−import qualified Streamly.Internal.Data.Stream.StreamD as D

26+import qualified Streamly.Internal.Data.Stream as D

27−import qualified Streamly.Internal.Data.Stream.StreamK as K

27+import qualified Streamly.Internal.Data.StreamK as K

28

29-- $setup

30-- >>> :m

core/src/Streamly/Internal/Data/Stream/Reduce.hs+1−1

@@ -69,7 +69,7 @@ import Streamly.Internal.Data.Unbox (Unbox)

69

70import qualified Streamly.Internal.Data.Array.Type as Array

71import 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

73

74import Prelude hiding (concatMap, map)

75

core/src/Streamly/Internal/Data/Stream/StreamD.hs+3−29

@@ -5,38 +5,12 @@

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8−--

9−-- Direct style re-implementation of CPS stream in

10−-- "Streamly.Internal.Data.Stream.StreamK". The symbol or suffix 'D' in this

11−-- module denotes the "Direct" style. GHC is able to INLINE and fuse direct

12−-- style better, providing better performance than CPS implementation.

13−--

14−-- @

15−-- import qualified Streamly.Internal.Data.Stream.StreamD as D

16−-- @

17

8

18module Streamly.Internal.Data.Stream.StreamD

9module Streamly.Internal.Data.Stream.StreamD

10+{-# DEPRECATED "Please use \"Streamly.Internal.Data.Stream\" instead." #-}

19 (

11 (

20− module Streamly.Internal.Data.Stream.StreamD.Type

12+ module Streamly.Internal.Data.Stream

21− , module Streamly.Internal.Data.Stream.StreamD.Generate

22− , module Streamly.Internal.Data.Stream.StreamD.Eliminate

23− , module Streamly.Internal.Data.Stream.StreamD.Exception

24− , module Streamly.Internal.Data.Stream.StreamD.Lift

25− , module Streamly.Internal.Data.Stream.StreamD.Transformer

26− , module Streamly.Internal.Data.Stream.StreamD.Nesting

27− , module Streamly.Internal.Data.Stream.StreamD.Transform

28− , module Streamly.Internal.Data.Stream.StreamD.Top

29− , module Streamly.Internal.Data.Stream.StreamD.Container

30 )

13 )

31where

14where

32

15

33−import Streamly.Internal.Data.Stream.StreamD.Type

16+import Streamly.Internal.Data.Stream

34−import Streamly.Internal.Data.Stream.StreamD.Generate

35−import Streamly.Internal.Data.Stream.StreamD.Eliminate

36−import Streamly.Internal.Data.Stream.StreamD.Exception

37−import Streamly.Internal.Data.Stream.StreamD.Lift

38−import Streamly.Internal.Data.Stream.StreamD.Transformer

39−import Streamly.Internal.Data.Stream.StreamD.Nesting

40−import Streamly.Internal.Data.Stream.StreamD.Transform

41−import Streamly.Internal.Data.Stream.StreamD.Top

42−import Streamly.Internal.Data.Stream.StreamD.Container

core/src/Streamly/Internal/Data/Stream/StreamK/Transformer.hs+1−1

@@ -18,7 +18,7 @@ where

18

19import Control.Monad.Trans.Class (MonadTrans(lift))

20import Control.Monad.Trans.State.Strict (StateT)

21−import Streamly.Internal.Data.Stream.StreamK

21+import Streamly.Internal.Data.StreamK

22 (StreamK, nil, cons, uncons, concatEffect)

23

24import 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 @@

1{-# LANGUAGE CPP #-}

2-- |

3−-- Module : Streamly.Internal.Data.Stream.StreamK

3+-- Module : Streamly.Internal.Data.StreamK

5--

6-- License : BSD3

@@ -8,7 +8,7 @@

8-- Stability : experimental

9-- Portability : GHC

10--

11−module Streamly.Internal.Data.Stream.StreamK

11+module Streamly.Internal.Data.StreamK

12 (

13 -- * Setup

14 -- | 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

208import qualified Streamly.Internal.Data.Parser as Parser

209import qualified Streamly.Internal.Data.Parser.ParserD.Type as PR

210import 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

212import qualified Prelude

213

214import Prelude

core/src/Streamly/Internal/FileSystem/Handle.hs+1−1

@@ -136,7 +136,7 @@ import qualified Streamly.Internal.Data.Stream.Chunked as AS

136import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

137import qualified Streamly.Internal.Data.Refold.Type as Refold

138import 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

140import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

141 (Stream(..), Step(..))

142import qualified Streamly.Internal.Data.Unfold as UF

core/src/Streamly/Internal/Serialize/ToBytes.hs+4−4

@@ -47,12 +47,12 @@ import Data.Char (ord)

47import Data.Int (Int8, Int16, Int32, Int64)

48import Data.Word (Word8, Word16, Word32, Word64)

49import GHC.Float (castDoubleToWord64, castFloatToWord32)

50−import Streamly.Internal.Data.Stream.StreamD (Stream)

50+import Streamly.Internal.Data.Stream (Stream)

51−import Streamly.Internal.Data.Stream.StreamD (Step(..))

51+import Streamly.Internal.Data.Stream (Step(..))

52import Streamly.Internal.Unicode.Stream (readCharUtf8)

53

54−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

54+import qualified Streamly.Internal.Data.Stream as Stream

55−import qualified Streamly.Internal.Data.Stream.StreamD as D

55+import qualified Streamly.Internal.Data.Stream as D

56

57-- XXX Use StreamD directly?

58

core/src/Streamly/Internal/Unicode/Stream.hs+4−4

@@ -104,8 +104,8 @@ import System.IO.Unsafe (unsafePerformIO)

104import Streamly.Internal.Data.Array.Type (Array(..))

105import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)

106import Streamly.Internal.Data.Fold (Fold)

107−import Streamly.Internal.Data.Stream.StreamD (Stream)

107+import Streamly.Internal.Data.Stream (Stream)

108−import Streamly.Internal.Data.Stream.StreamD (Step (..))

108+import Streamly.Internal.Data.Stream (Step (..))

109import Streamly.Internal.Data.SVar.Type (adaptState)

110import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

111import Streamly.Internal.Data.Unbox (peekWith)

@@ -117,8 +117,8 @@ import qualified Streamly.Data.Unfold as Unfold

117import qualified Streamly.Internal.Data.Array.Type as Array

118import qualified Streamly.Internal.Data.Parser as Parser (Parser)

119import qualified Streamly.Internal.Data.Parser as ParserD

120−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

120+import qualified Streamly.Internal.Data.Stream as Stream

121−import qualified Streamly.Internal.Data.Stream.StreamD as D

121+import qualified Streamly.Internal.Data.Stream as D

122

123import Prelude hiding (lines, words, unlines, unwords)

124

core/streamly-core.cabal+1−1

@@ -311,7 +311,7 @@ library

311 , Streamly.Internal.Data.Array.Generic.Mut.Type

312

313 -- streamly-core-streams

314− , Streamly.Internal.Data.Stream.StreamK

314+ , Streamly.Internal.Data.StreamK

315 -- StreamD depends on streamly-array-types

316 , Streamly.Internal.Data.Stream.StreamD.Generate

317 , 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.

244

245The combinators in `Streamly.Prelude` are defined in terms of combinators in

246`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

248stream from `StreamD` to `StreamK` representation or vice versa in some cases.

249

250Most 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:

153>>> and = Stream.fold Fold.and

154>>> all p = Stream.fold (Fold.all p)

155>>> (!!) i = Stream.fold (Fold.index i)

156−>>> tail = Streamly.Internal.Data.Stream.StreamK.tail

156+>>> tail = Streamly.Internal.Data.StreamK.tail

157−>>> init = Streamly.Internal.Data.Stream.StreamK.init

157+>>> init = Streamly.Internal.Data.StreamK.init

158```

159

160Mapping functions:

src/Streamly/Internal/Data/SmallArray.hs+1−1

@@ -53,7 +53,7 @@ import Streamly.Data.Stream (Stream)

53import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

54import Streamly.Internal.Data.Unfold.Type (Unfold(..))

55

56−import qualified Streamly.Internal.Data.Stream.StreamD as D

56+import qualified Streamly.Internal.Data.Stream as D

57import qualified Streamly.Internal.Data.Fold.Type as FL

58 (Fold (..), Step (Done, Partial))

59

src/Streamly/Internal/Data/Stream/Concurrent.hs+4−4

@@ -111,12 +111,12 @@ import Streamly.Internal.Data.Stream.Channel.Types

111 )

112import Streamly.Internal.Data.Stream.Channel.Worker (sendWithDoorBell)

113import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

114−import Streamly.Internal.Data.Stream.StreamD (Step(..))

114+import Streamly.Internal.Data.Stream (Step(..))

115

116import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed

117−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

117+import qualified Streamly.Internal.Data.Stream as Stream

118−import qualified Streamly.Internal.Data.Stream.StreamD as D

118+import qualified Streamly.Internal.Data.Stream as D

119−import qualified Streamly.Internal.Data.Stream.StreamK as K

119+import qualified Streamly.Internal.Data.StreamK as K

120import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

121

122import 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

51where

52

53import Streamly.Internal.Control.Concurrent (MonadAsync)

54−import Streamly.Internal.Data.Stream.StreamD (Stream)

54+import Streamly.Internal.Data.Stream (Stream)

55import Streamly.Internal.Data.Stream.Concurrent.Channel.Operations

56 (fromChannel, fromChannelK, toChannel, toChannelK)

57

@@ -59,7 +59,7 @@ import qualified Streamly.Internal.Data.Stream.Concurrent.Channel.Append

59 as Append

60import qualified Streamly.Internal.Data.Stream.Concurrent.Channel.Interleave

61 as Interleave

62−import qualified Streamly.Internal.Data.Stream.StreamK as K

62+import qualified Streamly.Internal.Data.StreamK as K

63

64import Streamly.Internal.Data.Stream.Concurrent.Channel.Type

65import 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)

38import Streamly.Internal.Data.Time.Clock (Clock(Monotonic), getTime)

39import System.Mem (performMajorGC)

40

41−import qualified Streamly.Internal.Data.Stream.StreamD as Stream

41+import qualified Streamly.Internal.Data.Stream as Stream

42import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

43import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

44

src/Streamly/Internal/Data/Stream/Exception/Lifted.hs+2−2

@@ -38,11 +38,11 @@ import Streamly.Internal.Control.Concurrent

38import Streamly.Internal.Data.Stream.StreamD.Type (Stream)

39import Streamly.Internal.Data.IOFinalizer.Lifted

40 (newIOFinalizer, runIOFinalizer, clearingIOFinalizer)

41−import Streamly.Internal.Data.Stream.StreamD (Step(..))

41+import Streamly.Internal.Data.Stream (Step(..))

42

43import qualified Control.Monad.Catch as MC

44import 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

46

47-- $setup

48-- >>> :m

src/Streamly/Internal/Data/Stream/IsStream.hs+1−1

@@ -39,7 +39,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type

39 hiding (cmpBy, drain, eqBy, foldl', fold, toList, toStream

40 , fromEffect, fromPure, repeat, fromStream)

41

42−import qualified Streamly.Internal.Data.Stream.StreamD as D

42+import qualified Streamly.Internal.Data.Stream as D

43

44{-# INLINE fromStream #-}

45fromStream :: (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

87import qualified Streamly.Internal.Data.Stream.Parallel as Par

88import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

89 (fromPure, fromEffect, repeatMWith, reverse)

90−import qualified Streamly.Internal.Data.Stream.StreamD as D

90+import qualified Streamly.Internal.Data.Stream as D

91 (repeatM, timesWith, foldAddLazy, map, scanlMAfter', postscanlMAfter'

92 , postscanlM', take, takeWhile, takeEndBy, drop, findIndices

93 , 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

172import qualified Streamly.Internal.Data.Parser as PRD

173-- import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK

174import 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

176 (foldr1, foldlT, foldlM', mapM_, null, head, headElse, last, elem

177 , notElem, all, any, minimum, minimumBy, maximum, maximumBy, the, lookup

178 , 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(..))

65import Streamly.Internal.Data.Stream.IsStream.Type (IsStream(..), fromStreamD)

66

67import 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

69 ( enumerateFromNum

70 , enumerateFromThenNum

71 , enumerateFromThenToIntegral

src/Streamly/Internal/Data/Stream/IsStream/Expand.hs+2−2

@@ -178,12 +178,12 @@ import Streamly.Data.Unfold (Unfold)

178import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

179import qualified Streamly.Internal.Data.Stream.Parallel as Par

180import 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

182 (append, interleave, interleaveFstSuffix, interleaveFst, interleaveMin

183 , roundRobin, mergeByM, unfoldMany, unfoldInterleave, intersperse

184 , unfoldRoundRobin, interpose, interposeSuffix, gintercalate

185 , 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)

187import qualified Streamly.Internal.Data.Stream.StreamK.Type as K

188 (interleave, append, mergeMapWith)

189import 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

110import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream

111import qualified Streamly.Internal.Data.Stream.Parallel as Par

112import 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

114 (unfold, unfoldr, toStreamK, unfoldr, repeat, replicate, replicateM

115 , fromIndices, fromIndicesM, iterate, iterateM, toStreamK, fromListM

116 , fromListM)

src/Streamly/Internal/Data/Stream/IsStream/Lift.hs+1−1

@@ -34,7 +34,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type

34 (IsStream(..), fromStreamD, toStreamD)

35import Streamly.Internal.Data.Stream.Serial (SerialT)

36

37−import qualified Streamly.Internal.Data.Stream.StreamD as D

37+import qualified Streamly.Internal.Data.Stream as D

38 (morphInner, liftInner, runReaderT, evalStateT, runStateT)

39

40------------------------------------------------------------------------------

src/Streamly/Internal/Data/Stream/IsStream/Reduce.hs+1−1

@@ -191,7 +191,7 @@ import qualified Streamly.Internal.Data.Fold as FL

191import qualified Streamly.Internal.Data.IsMap as IsMap

192import qualified Streamly.Internal.Data.Parser as PRD (Parser(..))

193import 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

195 ( foldMany

196 , groupsOf

197 , 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

83import qualified Streamly.Internal.Data.Stream.IsStream.Reduce as Stream

84import qualified Streamly.Internal.Data.Stream.IsStream.Transform as Stream

85import 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

87

88import Prelude hiding (Foldable(..), filter, zipWith, concatMap, concat)

89

src/Streamly/Internal/Data/Stream/IsStream/Transform.hs+1−1

@@ -256,7 +256,7 @@ import qualified Streamly.Data.Fold as FL

256import qualified Streamly.Internal.Data.Stream.Concurrent as Concur

257import qualified Streamly.Internal.Data.Stream.Parallel as Par

258import 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

260 (transform, foldrT, tap, tapOffsetEvery, mapM, scan

261 , scanMany, postscan, scanlx', scanlM', scanl', postscanl', prescanl'

262 , 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

127 (StreamK(..), cons, fromEffect

128 , nil, fromPure, bindWith, drain

129 , fromFoldable, nilM, repeat)

130−import qualified Streamly.Internal.Data.Stream.StreamK as StreamK

130+import qualified Streamly.Internal.Data.StreamK as StreamK

131import qualified Streamly.Internal.Data.Stream.Serial as Stream

132 (fromStreamK, toStreamK)

133import 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

78import qualified Streamly.Data.Unfold as Unfold

79import qualified Streamly.Internal.Data.Fold as Fold (Step(..))

80import 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

82 ( scanlMAfter'

83 , timeIndexed

84 , timestamped

src/Streamly/Internal/Data/Stream/Zip.hs+1−1

@@ -50,7 +50,7 @@ import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

50

51import qualified Streamly.Internal.Data.Stream.Common as P

52import 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

54import qualified Streamly.Internal.Data.Stream.Serial as Serial

55

56import 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

18 )

19where

20

21−import Streamly.Internal.Data.Stream.StreamD (Stream)

21+import Streamly.Internal.Data.Stream (Stream)

22import Streamly.Internal.Data.Stream.Concurrent (MonadAsync, parZipWith)

23

24−import qualified Streamly.Internal.Data.Stream.StreamD as Stream (repeat)

24+import qualified Streamly.Internal.Data.Stream as Stream (repeat)

25import Prelude hiding (map, repeat, zipWith)

26

27-- $setup

src/Streamly/Internal/Data/Stream/ZipAsync.hs+2−2

@@ -25,9 +25,9 @@ where

25import Streamly.Internal.Control.Concurrent (MonadAsync)

26import Streamly.Internal.Data.Stream.StreamK.Type (Stream)

27

28−import qualified Streamly.Internal.Data.Stream.StreamK as K

28+import qualified Streamly.Internal.Data.StreamK as K

29 (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)

31import qualified Streamly.Internal.Data.Stream.Serial as Serial

32import qualified Streamly.Internal.Data.Stream.SVar.Eliminate as SVar

33import qualified Streamly.Internal.Data.Stream.SVar.Generate as SVar

src/Streamly/Internal/FileSystem/Event.hs+1−1

@@ -48,7 +48,7 @@ where

48import Data.List.NonEmpty (NonEmpty)

49import Data.Word (Word8)

50import Streamly.Internal.Data.Array (Array)

51−import Streamly.Internal.Data.Stream.StreamD (Stream)

51+import Streamly.Internal.Data.Stream (Stream)

52

53#if defined(CABAL_OS_DARWIN)

54import 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)

171import GHC.IO.Device (IODeviceType(Stream))

172import GHC.IO.FD (fdFD, mkFD)

173import GHC.IO.Handle.FD (mkHandleFromFD)

174−import Streamly.Internal.Data.Stream.StreamD (Stream)

174+import Streamly.Internal.Data.Stream (Stream)

175import Streamly.Internal.Data.Parser (Parser)

176import Streamly.Internal.Data.Array.Type (Array(..), byteLength)

177import System.Directory (doesDirectoryExist)

@@ -184,7 +184,7 @@ import qualified Streamly.Internal.Data.Array as A

184import qualified Streamly.Data.Fold as FL

185import qualified Streamly.Internal.Data.Parser as PR

186 (takeEQ, fromEffect, fromFold)

187−import qualified Streamly.Internal.Data.Stream.StreamD as S

187+import qualified Streamly.Internal.Data.Stream as S

188import qualified Streamly.Internal.FileSystem.Dir as Dir

189import qualified Streamly.Internal.FileSystem.Handle as FH

190import 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

148import qualified Streamly.Internal.Data.Array.Mut as MArray

149 (MutArray(..), newPinnedBytes, asPtrUnsafe)

150import 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

152import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

153 (Stream(..), Step(..))

154import 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

124import qualified Streamly.Internal.Data.Array.Type as A

125import qualified Streamly.Internal.Data.Unfold as UF (first, bracketIO)

126import 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

128import qualified Streamly.Internal.Data.Stream.Exception.Lifted as S

129import qualified Streamly.Internal.Network.Socket as ISK

130

src/Streamly/Internal/Network/Socket.hs+1−1

@@ -100,7 +100,7 @@ import qualified Streamly.Internal.Data.Array.Type as A

100 (unsafeFreeze, asPtrUnsafe, byteLength, writeNUnsafe, chunksOf)

101import qualified Streamly.Internal.Data.Array.Mut as MArray

102 (MutArray(..), newPinnedBytes, asPtrUnsafe)

103−import qualified Streamly.Internal.Data.Stream.StreamD as S

103+import qualified Streamly.Internal.Data.Stream as S

104import qualified Streamly.Internal.Data.Stream.StreamD.Type as D

105 (Stream(..), Step(..))

106import 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(..))

36

37import qualified Streamly.Internal.Data.Array.Type as Array

38import 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

40-}

41#endif

42

src/Streamly/Internal/Unicode/Char.hs+2−2

@@ -35,9 +35,9 @@ where

35

36import Data.Char (isAsciiUpper, isAsciiLower, chr, ord)

37import Unicode.Char (DecomposeMode(..))

38−import Streamly.Internal.Data.Stream.StreamD (Stream(..), Step (..))

38+import Streamly.Internal.Data.Stream (Stream(..), Step (..))

39

40−import qualified Streamly.Internal.Data.Stream.StreamD as Stream (Stream)

40+import qualified Streamly.Internal.Data.Stream as Stream (Stream)

41

42import qualified Unicode.Char as Char

43

test/Streamly/Test/Data/Parser/ParserD.hs+1−1

@@ -20,7 +20,7 @@ import qualified Streamly.Internal.Data.Parser as P

20import qualified Streamly.Internal.Data.Producer.Source as Source

21import qualified Streamly.Internal.Data.Producer as Producer

22import 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

24import qualified Streamly.Internal.Data.Unfold as Unfold

25import qualified Test.Hspec as H

26

test/Streamly/Test/Data/Unfold.hs+2−2

@@ -16,8 +16,8 @@ import qualified Prelude

16import qualified Streamly.Internal.Data.Fold as Fold

17import qualified Streamly.Internal.Data.Unfold as UF

18import qualified Streamly.Internal.Data.Stream as S

19−import qualified Streamly.Internal.Data.Stream.StreamD as D

19+import qualified Streamly.Internal.Data.Stream as D

20−import qualified Streamly.Internal.Data.Stream.StreamK as K

20+import qualified Streamly.Internal.Data.StreamK as K

21

22import Control.Monad.Trans.State.Strict

23import Data.Functor.Identity

test/Streamly/Test/Prelude/Serial.hs+1−1

@@ -49,7 +49,7 @@ import qualified Streamly.Data.Stream.Prelude as S

49import qualified Streamly.Internal.Data.Fold as FL

50import qualified Streamly.Internal.Data.Unfold as UF

51import 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

53import qualified Streamly.Data.Array as A

54import qualified Streamly.Internal.Data.Parser as Parser

55import qualified Streamly.Prelude as SP

test/Streamly/Test/Unicode/Stream.hs+1−1

@@ -21,7 +21,7 @@ import Test.QuickCheck.Monadic (run, monadicIO, assert)

21import qualified Streamly.Data.Array as A

22import qualified Streamly.Data.Stream as Stream

23import 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

25import qualified Streamly.Unicode.Stream as SS

26import qualified Streamly.Internal.Unicode.Stream as IUS

27import qualified Streamly.Internal.Unicode.Array as IUA