4eda9d0 · streamly · git.iko.soy

benchmark/NanoBenchmarks.hs+1−1

compare with master

unifiedsplit

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

12import Streamly.Internal.Data.Stream (Stream)

13import System.IO (hSeek, SeekMode(..), openFile, IOMode(..))

14

15−import qualified Streamly.Data.Array.Unboxed as A

15+import qualified Streamly.Data.Array as A

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

17import qualified Streamly.Data.Fold as FL

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

benchmark/Streamly/Benchmark/Data/Array/Unboxed.hs → benchmark/Streamly/Benchmark/Data/Array.hsrenamed+4−4

@@ -6,11 +6,11 @@

6

7import Control.DeepSeq (deepseq)

8

9−import qualified Streamly.Internal.Data.Array.Unboxed as IA

9+import qualified Streamly.Internal.Data.Array as IA

10import qualified GHC.Exts as GHC

11

12−-- import qualified Streamly.Data.Array.Unboxed as A

12+-- import qualified Streamly.Data.Array as A

13−import qualified Streamly.Internal.Data.Array.Unboxed as A

13+import qualified Streamly.Internal.Data.Array as A

14type Stream = A.Array

15

16#include "Streamly/Benchmark/Data/Array/Common.hs"

@@ -116,7 +116,7 @@ o_n_heap_serial value =

116 ]

117

118moduleName :: String

119−moduleName = "Data.Array.Unboxed"

119+moduleName = "Data.Array"

120

121defStreamSize :: Int

122defStreamSize = defaultStreamSize

benchmark/Streamly/Benchmark/Data/Array/Unboxed/Mut.hs → benchmark/Streamly/Benchmark/Data/Array/Mut.hsrenamed+3−3

@@ -42,8 +42,8 @@ import Prelude

42 , undefined

43 )

44

45−import qualified Streamly.Internal.Data.Array.Unboxed as Array

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

46−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MArray

46+import qualified Streamly.Internal.Data.Array.Mut as MArray

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

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

49import qualified Streamly.Prelude as IsStream (scanl1')

@@ -270,7 +270,7 @@ o_1_space_serial_marray value ~(array, indices) =

270-------------------------------------------------------------------------------

271

272moduleName :: String

273−moduleName = "Data.Array.Unboxed.Mut"

273+moduleName = "Data.Array.Mut"

274

275main :: IO ()

276main = do

benchmark/Streamly/Benchmark/Data/Array/Stream/Unboxed.hs → benchmark/Streamly/Benchmark/Data/Array/Stream.hsrenamed+3−3

@@ -36,8 +36,8 @@ import System.IO (Handle)

36import System.Random (randomRIO)

37import Prelude hiding ()

38

39−import qualified Streamly.Internal.Data.Array.Unboxed as Array

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

40−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as ArrayStream

40+import qualified Streamly.Internal.Data.Array.Stream as ArrayStream

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

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

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

@@ -275,7 +275,7 @@ o_1_space_serial_array bound arraysSmall arraysBig =

275-------------------------------------------------------------------------------

276

277moduleName :: String

278−moduleName = "Data.Array.Unboxed.Stream"

278+moduleName = "Data.Array.Stream"

279

280main :: IO ()

281main = do

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

@@ -33,7 +33,7 @@ import qualified Data.Traversable as TR

33import qualified Data.Foldable as F

34import qualified Control.Applicative as AP

35import qualified Streamly.FileSystem.Handle as Handle

36−import qualified Streamly.Internal.Data.Array.Unboxed as Array

36+import qualified Streamly.Internal.Data.Array as Array

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

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

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

benchmark/Streamly/Benchmark/Data/Parser/ParserD.hs+1−1

@@ -29,7 +29,7 @@ import Prelude hiding (any, all, take, sequence, sequenceA, sequence_, takeWhile

29import qualified Data.Traversable as TR

30import qualified Data.Foldable as F

31import qualified Control.Applicative as AP

32−import qualified Streamly.Internal.Data.Array.Unboxed as Array

32+import qualified Streamly.Internal.Data.Array as Array

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

34import qualified Streamly.Internal.Data.Parser.ParserD as PR

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

benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs+1−1

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

13import Control.Monad (void)

14import GHC.Ptr (Ptr(..))

15

16−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

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

18import qualified Data.Foldable as P

19

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

@@ -27,7 +27,7 @@ import Data.Word (Word8)

27import System.IO (Handle)

28

29import qualified Streamly.FileSystem.Handle as FH

30−import qualified Streamly.Internal.Data.Array.Unboxed as A

30+import qualified Streamly.Internal.Data.Array as A

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

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

33import qualified Streamly.Internal.Data.Stream.IsStream as IP

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

43#ifdef INSPECTION

44import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

45

46−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

46+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

48

49import Test.Inspection

benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs+3−3

@@ -30,8 +30,8 @@ import GHC.Magic (noinline)

30import System.IO (Handle)

31

32import qualified Streamly.FileSystem.Handle as FH

33−import qualified Streamly.Internal.Data.Array.Unboxed as A

33+import qualified Streamly.Internal.Data.Array as A

34−import qualified Streamly.Internal.Data.Array.Unboxed.Type as AT

34+import qualified Streamly.Internal.Data.Array.Type as AT

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

36import qualified Streamly.Internal.Data.Stream.IsStream as IP

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

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

46#ifdef INSPECTION

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

48

49−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

49+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

50import qualified Streamly.Internal.Data.Stream.StreamD as D

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

52

benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs+3−3

@@ -31,7 +31,7 @@ import Streamly.Internal.System.IO (defaultChunkSize)

31import qualified Streamly.FileSystem.Handle as FH

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

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

34−import qualified Streamly.Data.Array.Unboxed as A

34+import qualified Streamly.Data.Array as A

35import qualified Streamly.Prelude as S

36

37import Gauge hiding (env)

@@ -42,8 +42,8 @@ import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

42

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

44import qualified Streamly.Internal.Data.Tuple.Strict as Strict

45−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Stream as MAS

45+import qualified Streamly.Internal.Data.Array.Mut.Stream as MAS

46−import qualified Streamly.Internal.Data.Array.Unboxed.Type as AT

46+import qualified Streamly.Internal.Data.Array.Type as AT

47

48import Test.Inspection

49#endif

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

@@ -13,7 +13,7 @@

13--------------------------------------------------------------------------------

14

15import Control.DeepSeq (NFData)

16−import Streamly.Internal.Data.Array.Unboxed (Array)

16+import Streamly.Internal.Data.Array (Array)

17import System.FilePath (dropExtensions, takeFileName)

18import System.FilePath.Posix ((</>))

19import Gauge.Main (Benchmark, bench, bgroup, defaultMain, env, nfIO)

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

23 )

24import Streamly.Benchmark.Common (o_1_space_prefix)

25

26−import qualified Streamly.Internal.Data.Array.Unboxed as Array

26+import qualified Streamly.Internal.Data.Array as Array

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

28import qualified System.Directory as Dir

29

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

@@ -23,7 +23,7 @@

23import Prelude hiding (last, length)

24import System.IO (Handle)

25

26−import qualified Streamly.Data.Array.Unboxed as Array

26+import qualified Streamly.Data.Array as Array

27import qualified Streamly.Data.Fold as Fold

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

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

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

40import Streamly.Internal.Data.Stream.StreamD.Type (Step(..))

41import qualified Streamly.Internal.Data.Fold.Type as Fold

42import qualified Streamly.Internal.Data.Tuple.Strict as Strict

43−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

44

45import Test.Inspection

46#endif

benchmark/streamly-benchmarks.cabal+7−7

@@ -572,10 +572,10 @@ benchmark Data.SmallArray

572 else

573 buildable: False

574

575−benchmark Data.Array.Unboxed

575+benchmark Data.Array

576 import: bench-options

577 type: exitcode-stdio-1.0

578− main-is: Streamly/Benchmark/Data/Array/Unboxed.hs

578+ main-is: Streamly/Benchmark/Data/Array.hs

579 if flag(use-streamly-core)

580 buildable: False

581 else

@@ -583,10 +583,10 @@ benchmark Data.Array.Unboxed

583 if flag(limit-build-mem)

584 ghc-options: +RTS -M1500M -RTS

585

586−benchmark Data.Array.Unboxed.Mut

586+benchmark Data.Array.Mut

587 import: bench-options

588 type: exitcode-stdio-1.0

589− main-is: Streamly/Benchmark/Data/Array/Unboxed/Mut.hs

589+ main-is: Streamly/Benchmark/Data/Array/Mut.hs

590 if flag(limit-build-mem)

591 ghc-options: +RTS -M1500M -RTS

592 if flag(use-streamly-core)

@@ -609,11 +609,11 @@ benchmark Data.Ring.Unboxed

609-- Array Stream Benchmarks

610-------------------------------------------------------------------------------

611

612−benchmark Data.Array.Unboxed.Stream

612+benchmark Data.Array.Stream

613 import: bench-options

614 type: exitcode-stdio-1.0

615− hs-source-dirs: Streamly/Benchmark/Data/Array/Stream

615+ hs-source-dirs: Streamly/Benchmark/Data/Array

616− main-is: Unboxed.hs

616+ main-is: Stream.hs

617 if flag(use-streamly-core) || impl(ghcjs)

618 buildable: False

619 else

core/src/Streamly/Console/Stdio.hs+1−1

@@ -33,7 +33,7 @@ where

33

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

35import Data.Word (Word8)

36−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

36+import Streamly.Internal.Data.Array.Type (Array)

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

38

39import Streamly.Internal.Console.Stdio hiding (read, readChunks)

core/src/Streamly/Data/Array/Unboxed.hs → core/src/Streamly/Data/Array.hsrenamed+7−7

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Data.Array.Unboxed

2+-- Module : Streamly.Data.Array

4--

5-- License : BSD3

@@ -45,11 +45,11 @@

45--

46-- This module is designed to be imported qualified:

47--

48−-- > import qualified Streamly.Data.Array.Unboxed as Array

48+-- > import qualified Streamly.Data.Array as Array

49--

50−-- For experimental APIs see "Streamly.Internal.Data.Array.Unboxed".

50+-- For experimental APIs see "Streamly.Internal.Data.Array".

51

52−module Streamly.Data.Array.Unboxed

52+module Streamly.Data.Array

53 (

54 -- * Types

55 Unbox (..)

@@ -99,7 +99,7 @@ where

99#include "inline.hs"

100

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

102−import Streamly.Internal.Data.Array.Unboxed as A hiding (read, readRev)

102+import Streamly.Internal.Data.Array as A hiding (read, readRev)

103

104import Streamly.Internal.Data.Unboxed (Unbox (..))

105import Prelude hiding (read)

@@ -108,9 +108,9 @@ import Prelude hiding (read)

108-- >>> :m

109-- >>> :set -XFlexibleContexts

110-- >>> import Streamly.Internal.Data.Stream (Stream)

111−-- >>> import Streamly.Data.Array.Unboxed (Array)

111+-- >>> import Streamly.Data.Array (Array)

112-- >>> import qualified Streamly.Internal.Data.Stream as Stream

113−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

113+-- >>> import qualified Streamly.Data.Array as Array

114

115-- | Same as 'reader'

116--

core/src/Streamly/Data/Array/Unboxed/Mut.hs → core/src/Streamly/Data/Array/Mut.hsrenamed+3−3

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Data.Array.Unboxed.Mut

2+-- Module : Streamly.Data.Array.Mut

4--

5-- License : BSD3

@@ -11,7 +11,7 @@

11-- random access, and mutation.

12--

13

14−module Streamly.Data.Array.Unboxed.Mut

14+module Streamly.Data.Array.Mut

15 (

16 -- * Types

17 Unbox (..)

@@ -60,5 +60,5 @@ module Streamly.Data.Array.Unboxed.Mut

60where

61

62import Prelude hiding (length, read)

63−import Streamly.Internal.Data.Array.Unboxed.Mut

63+import Streamly.Internal.Data.Array.Mut

64import Streamly.Internal.Data.Unboxed (Unbox (..))

core/src/Streamly/FileSystem/Handle.hs+2−2

@@ -35,7 +35,7 @@

35-- Design notes:

36--

37-- By design, file handle IO APIs are quite similar to

38−-- "Streamly.Data.Array.Unboxed" read write APIs. In that regard, arrays can be

38+-- "Streamly.Data.Array" read write APIs. In that regard, arrays can be

39-- considered as in-memory files or files can be considered as on-disk arrays.

40--

41module Streamly.FileSystem.Handle

@@ -109,7 +109,7 @@ where

109

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

111import Data.Word (Word8)

112−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

112+import Streamly.Internal.Data.Array.Type (Array)

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

114import System.IO (Handle)

115

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

@@ -46,12 +46,12 @@ import Data.Word (Word8)

46import System.IO (stdin, stdout, stderr)

47import Prelude hiding (read)

48

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

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

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

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

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

53

54−import qualified Streamly.Internal.Data.Array.Unboxed as Array

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

55import qualified Streamly.Internal.Data.Stream as Stream (intersperseSuffix)

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

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

core/src/Streamly/Internal/Data/Array/Unboxed.hs → core/src/Streamly/Internal/Data/Array.hsrenamed+10−10

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed

2+-- Module : Streamly.Internal.Data.Array

4--

5-- License : BSD3

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

18-- less efficient compared to folding via streams. 'Semigroup' and 'Monoid'

19-- instances should be used with care; concatenating arrays using binary

20-- operations can be highly inefficient. Instead, use

21−-- 'Streamly.Internal.Data.Array.Unboxed.Stream.toArray' to concatenate N

21+-- 'Streamly.Internal.Data.Array.Stream.toArray' to concatenate N

22-- arrays at once.

23--

24-- Each array is one pointer visible to the GC. Too many small arrays (e.g.

@@ -28,7 +28,7 @@

28-- if we use one array for each chunk. This is still significant to add

29-- pressure to GC.

30

31−module Streamly.Internal.Data.Array.Unboxed

31+module Streamly.Internal.Data.Array

32 (

33 Array

34

@@ -133,8 +133,8 @@ import Streamly.Internal.Data.Unboxed

133 )

134import Prelude hiding (length, null, last, map, (!!), read, concat)

135

136−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (ArrayUnsafe(..))

136+import Streamly.Internal.Data.Array.Mut.Type (ArrayUnsafe(..))

137−import Streamly.Internal.Data.Array.Unboxed.Type

137+import Streamly.Internal.Data.Array.Type

138 (Array(..), length, asPtrUnsafe)

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

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

@@ -143,9 +143,9 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple3Fused'(..))

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

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

145

146−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

146+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

147−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MA

147+import qualified Streamly.Internal.Data.Array.Mut as MA

148−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

148+import qualified Streamly.Internal.Data.Array.Type as A

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

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

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

@@ -233,7 +233,7 @@ readerUnsafe = Unfold step inject

233

234-- |

235--

236−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

236+-- >>> import qualified Streamly.Internal.Data.Array.Type as Array

237-- >>> null arr = Array.byteLength arr == 0

238--

239-- /Pre-release/

@@ -256,7 +256,7 @@ getIndexRev i arr =

256

257-- |

258--

259−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed as Array

259+-- >>> import qualified Streamly.Internal.Data.Array as Array

260-- >>> last arr = Array.getIndexRev arr 0

261--

262-- /Pre-release/

core/src/Streamly/Internal/Data/Array/Unboxed/Fold.hs → core/src/Streamly/Internal/Data/Array/Fold.hsrenamed+7−7

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed.Fold

2+-- Module : Streamly.Internal.Data.Array.Fold

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

@@ -18,8 +18,8 @@

18-- element stream. For example:

19--

20-- >>> import qualified Streamly.Data.Fold as Fold

21−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Stream as ArrayStream

21+-- >>> import qualified Streamly.Internal.Data.Array.Stream as ArrayStream

22−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Fold as ArrayFold

22+-- >>> import qualified Streamly.Internal.Data.Array.Fold as ArrayFold

23-- >>> import qualified Streamly.Internal.Data.Stream as Stream (arraysOf)

24-- >>> import qualified Streamly.Data.Stream as Stream

25--

@@ -28,7 +28,7 @@

28-- >>> ArrayStream.runArrayFold f s

29-- "hello w"

30--

31−module Streamly.Internal.Data.Array.Unboxed.Fold

31+module Streamly.Internal.Data.Array.Fold

32 (

33 ArrayFold (..)

34

@@ -63,12 +63,12 @@ import Control.Monad.IO.Class (MonadIO(..))

63import Data.Bifunctor (first)

64import Streamly.Internal.Data.Unboxed (peekWith, sizeOf, Unbox)

65import GHC.Types (SPEC(..))

66−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (touch)

66+import Streamly.Internal.Data.Array.Mut.Type (touch)

67−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

67+import Streamly.Internal.Data.Array.Type (Array(..))

68import Streamly.Internal.Data.Parser.ParserD (Initial(..), Step(..))

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

70

71−import qualified Streamly.Internal.Data.Array.Unboxed as Array

71+import qualified Streamly.Internal.Data.Array as Array

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

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

74import qualified Streamly.Internal.Data.Parser.ParserD.Type as ParserD

core/src/Streamly/Internal/Data/Array/Unboxed/Mut.hs → core/src/Streamly/Internal/Data/Array/Mut.hsrenamed+4−4

@@ -1,7 +1,7 @@

1#include "inline.hs"

2

3-- |

4−-- Module : Streamly.Internal.Data.Array.Unboxed.Mut

4+-- Module : Streamly.Internal.Data.Array.Mut

6-- License : BSD-3-Clause

7-- Maintainer : streamly@composewell.com

@@ -22,9 +22,9 @@

22-- Stream and Fold APIs allow easy, efficient and convenient operations on

23-- arrays.

24

25−module Streamly.Internal.Data.Array.Unboxed.Mut

25+module Streamly.Internal.Data.Array.Mut

26 (

27− module Streamly.Internal.Data.Array.Unboxed.Mut.Type

27+ module Streamly.Internal.Data.Array.Mut.Type

28 , splitOn

29 , genSlicesFromLen

30 , getSlicesFromLen

@@ -43,7 +43,7 @@ import qualified Streamly.Internal.Data.Unfold as Unfold

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

44

45import Prelude hiding (foldr, length, read, splitAt)

46−import Streamly.Internal.Data.Array.Unboxed.Mut.Type

46+import Streamly.Internal.Data.Array.Mut.Type

47

48-- | Split the array into a stream of slices using a predicate. The element

49-- matching the predicate is dropped.

core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Stream.hs → core/src/Streamly/Internal/Data/Array/Mut/Stream.hsrenamed+8−8

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed.Mut.Stream

2+-- Module : Streamly.Internal.Data.Array.Mut.Stream

4-- License : BSD3-3-Clause

5-- Maintainer : streamly@composewell.com

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

8--

9-- Combinators to efficiently manipulate streams of mutable arrays.

10--

11−module Streamly.Internal.Data.Array.Unboxed.Mut.Stream

11+module Streamly.Internal.Data.Array.Mut.Stream

12 (

13 -- * Generation

14 arraysOf

@@ -32,12 +32,12 @@ import Control.Monad (when)

32import Control.Monad.Catch (MonadThrow)

33import Data.Bifunctor (first)

34import Streamly.Internal.Data.Unboxed (Unbox, sizeOf)

35−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (Array(..))

35+import Streamly.Internal.Data.Array.Mut.Type (Array(..))

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

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

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

39

40−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MArray

40+import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

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

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

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

@@ -92,7 +92,7 @@ packArraysChunksOf n (D.Stream step state) =

92 step' gst (SpliceInitial st) = do

93 when (n <= 0) $

94 -- XXX we can pass the module string from the higher level API

95− error $ "Streamly.Internal.Data.Array.Unboxed.Mut.Type.packArraysChunksOf: the size of "

95+ error $ "Streamly.Internal.Data.Array.Mut.Type.packArraysChunksOf: the size of "

96 ++ "arrays [" ++ show n ++ "] must be a natural number"

97 r <- step gst st

98 case r of

@@ -139,7 +139,7 @@ lpackArraysChunksOf n (Fold step1 initial1 extract1) =

139 initial = do

140 when (n <= 0) $

141 -- XXX we can pass the module string from the higher level API

142− error $ "Streamly.Internal.Data.Array.Unboxed.Mut.Type.packArraysChunksOf: the size of "

142+ error $ "Streamly.Internal.Data.Array.Mut.Type.packArraysChunksOf: the size of "

143 ++ "arrays [" ++ show n ++ "] must be a natural number"

144

145 r <- initial1

@@ -243,7 +243,7 @@ compactLEParserD n = ParserD.Parser step initial extract

243 extract (Just buf) = return $ ParserD.Done 0 buf

244

245 functionPath =

246− "Streamly.Internal.Data.Array.Unboxed.Mut.Stream.compactLEParserD"

246+ "Streamly.Internal.Data.Array.Mut.Stream.compactLEParserD"

247

248-- | Coalesce adjacent arrays in incoming stream to form bigger arrays of a

249-- minimum specified size. Note that if all the arrays in the stream together

@@ -292,7 +292,7 @@ compactGEFold n = Fold step initial extract

292 extract (Just buf) = return buf

293

294 functionPath =

295− "Streamly.Internal.Data.Array.Unboxed.Mut.Stream.compactGEFold"

295+ "Streamly.Internal.Data.Array.Mut.Stream.compactGEFold"

296

297-- | Coalesce adjacent arrays in incoming stream to form bigger arrays of a

298-- maximum specified size in bytes.

core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Type.hs → core/src/Streamly/Internal/Data/Array/Mut/Type.hsrenamed+4−4

@@ -1,6 +1,6 @@

1{-# LANGUAGE UnboxedTuples #-}

2-- |

3−-- Module : Streamly.Internal.Data.Array.Unboxed.Mut.Type

3+-- Module : Streamly.Internal.Data.Array.Mut.Type

5-- License : BSD3-3-Clause

6-- Maintainer : streamly@composewell.com

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

12-- strive to keep the API consistent for both. Ideally, you should be able to

13-- replace one with another with little changes to the code.

14

15−module Streamly.Internal.Data.Array.Unboxed.Mut.Type

15+module Streamly.Internal.Data.Array.Mut.Type

16 (

17 -- * Type

18 -- $arrayNotes

@@ -263,7 +263,7 @@ import Prelude hiding

263

264-- $setup

265-- >>> :m

266−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as Array

266+-- >>> import qualified Streamly.Internal.Data.Array.Mut.Type as Array

267-- >>> import qualified Streamly.Internal.Data.Stream as Stream

268-- >>> import qualified Streamly.Internal.Data.Stream.StreamD as StreamD

269-- >>> import qualified Streamly.Internal.Data.Fold as Fold

@@ -1297,7 +1297,7 @@ arraysOf n (D.Stream step state) =

1297 step' _ (GroupStart st) = do

1298 when (n <= 0) $

1299 -- XXX we can pass the module string from the higher level API

1300− error $ "Streamly.Internal.Data.Array.Unboxed.Mut.Type.arraysOf: "

1300+ error $ "Streamly.Internal.Data.Array.Mut.Type.arraysOf: "

1301 ++ "the size of arrays [" ++ show n

1302 ++ "] must be a natural number"

1303 Array contents start end bound <- liftIO $ newPinned n

core/src/Streamly/Internal/Data/Array/Unboxed/Stream.hs → core/src/Streamly/Internal/Data/Array/Stream.hsrenamed+11−11

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed.Stream

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

4-- License : BSD3-3-Clause

5-- Maintainer : streamly@composewell.com

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

8--

9-- Combinators to efficiently manipulate streams of immutable arrays.

10--

11−module Streamly.Internal.Data.Array.Unboxed.Stream

11+module Streamly.Internal.Data.Array.Stream

12 (

13 -- * Creation

14 arraysOf

@@ -63,22 +63,22 @@ import Prelude hiding (null, last, (!!), read, concat, unlines)

63

64import Streamly.Data.Fold (Fold)

65import Streamly.Data.Stream (Stream)

66−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

66+import Streamly.Internal.Data.Array.Type (Array(..))

67−import Streamly.Internal.Data.Array.Unboxed.Fold (ArrayFold(..))

67+import Streamly.Internal.Data.Array.Fold (ArrayFold(..))

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

69import Streamly.Internal.Data.Stream

70 (fromStreamD, fromStreamK, toStreamD, toStreamK)

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

72−import Streamly.Internal.Data.Array.Unboxed.Mut.Type

72+import Streamly.Internal.Data.Array.Mut.Type

73 (allocBytesToElemCount)

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

75

76import qualified Streamly.Data.Fold as FL

77−import qualified Streamly.Internal.Data.Array.Unboxed as A

77+import qualified Streamly.Internal.Data.Array as A

78−import qualified Streamly.Internal.Data.Array.Unboxed as Array

78+import qualified Streamly.Internal.Data.Array as Array

79−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

79+import qualified Streamly.Internal.Data.Array.Type as A

80−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

80+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

81−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Stream as AS

81+import qualified Streamly.Internal.Data.Array.Mut.Stream as AS

82import qualified Streamly.Internal.Data.Fold.Type as FL (Fold(..), Step(..))

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

84import qualified Streamly.Internal.Data.Parser.ParserD as PRD

@@ -201,7 +201,7 @@ unlines sep (D.Stream step state) = D.Stream step' (OuterLoop state)

201-------------------------------------------------------------------------------

202

203-- XXX These would not be needed once we implement compactLEFold, see

204−-- module Streamly.Internal.Data.Array.Unboxed.Mut.Stream

204+-- module Streamly.Internal.Data.Array.Mut.Stream

205--

206{-# INLINE_NORMAL packArraysChunksOf #-}

207packArraysChunksOf :: (MonadIO m, Unbox a)

core/src/Streamly/Internal/Data/Array/Unboxed/Type.hs → core/src/Streamly/Internal/Data/Array/Type.hsrenamed+6−6

@@ -1,5 +1,5 @@

1-- |

2−-- Module : Streamly.Internal.Data.Array.Unboxed.Type

2+-- Module : Streamly.Internal.Data.Array.Type

4--

5-- License : BSD3-3-Clause

@@ -7,9 +7,9 @@

7-- Stability : experimental

8-- Portability : GHC

9--

10−-- See notes in "Streamly.Internal.Data.Array.Unboxed.Mut.Type"

10+-- See notes in "Streamly.Internal.Data.Array.Mut.Type"

11--

12−module Streamly.Internal.Data.Array.Unboxed.Type

12+module Streamly.Internal.Data.Array.Type

13 (

14 -- $arrayNotes

15 Array (..)

@@ -87,7 +87,7 @@ import GHC.Exts (IsList, IsString(..))

87

88import GHC.IO (unsafePerformIO)

89import GHC.Ptr (Ptr(..))

90−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (MutableByteArray)

90+import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)

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

92import Streamly.Internal.Data.Stream.Type (Stream)

93import Streamly.Internal.Data.Unboxed (Unbox, peekWith, sizeOf)

@@ -97,7 +97,7 @@ import Text.Read (readPrec, readListPrec, readListPrecDefault)

97import Prelude hiding (length, foldr, read, unlines, splitAt)

98

99import qualified GHC.Exts as Exts

100−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

100+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

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

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

@@ -111,7 +111,7 @@ import Streamly.Internal.System.IO (unsafeInlineIO, defaultChunkSize)

111-- >>> :m

112-- >>> :set -XMagicHash

113-- >>> import Prelude hiding (length, foldr, read, unlines, splitAt)

114−-- >>> import Streamly.Internal.Data.Array.Unboxed as Array

114+-- >>> import Streamly.Internal.Data.Array as Array

115

116-------------------------------------------------------------------------------

117-- Array Data Type

core/src/Streamly/Internal/Data/Binary/Decode.hs+2−2

@@ -31,8 +31,8 @@ import Streamly.Internal.Data.Parser (Parser)

31import Streamly.Internal.Data.Maybe.Strict (Maybe'(..))

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

33

34−import qualified Streamly.Data.Array.Unboxed as A

34+import qualified Streamly.Data.Array as A

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

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

36 (unsafeIndex, castUnsafe)

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

38 (fromPure, either, satisfy, takeEQ)

core/src/Streamly/Internal/Data/Fold.hs+4−4

@@ -315,8 +315,8 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..), Tuple3'(..))

315import Streamly.Internal.Data.Stream.Type (Stream)

316

317import qualified Prelude

318−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

318+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

319−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

320import qualified Streamly.Internal.Data.Fold.Window as FoldW

321import qualified Streamly.Internal.Data.Pipe.Type as Pipe

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

@@ -342,10 +342,10 @@ import Streamly.Internal.Data.Fold.Type

342-- >>> import Data.Monoid (Last(..), Sum(..))

343-- >>> import Streamly.Data.Stream (Stream)

344-- >>> import Data.IORef (newIORef, readIORef, writeIORef)

345−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

345+-- >>> import qualified Streamly.Data.Array as Array

346-- >>> import qualified Streamly.Data.Fold as Fold

347-- >>> import qualified Streamly.Data.Stream as Stream

348−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

348+-- >>> import qualified Streamly.Internal.Data.Array.Mut.Type as MA

349-- >>> import qualified Streamly.Internal.Data.Fold as Fold

350-- >>> import qualified Streamly.Internal.Data.Fold.Type as Fold

351-- >>> import qualified Streamly.Internal.Data.Fold.Window as FoldW

core/src/Streamly/Internal/Data/Fold/Type.hs+1−1

@@ -658,7 +658,7 @@ drain = foldl' (\_ _ -> ()) ()

658-- | Folds the input stream to a list.

659--

660-- /Warning!/ working on large lists accumulated as buffers in memory could be

661−-- very inefficient, consider using "Streamly.Data.Array.Unboxed"

661+-- very inefficient, consider using "Streamly.Data.Array"

662-- instead.

663--

664-- >>> toList = Fold.foldr' (:) []

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

@@ -245,7 +245,7 @@ import Prelude

245-- import Streamly.Data.Fold.Types (Fold(..))

246import Streamly.Internal.Data.Pipe.Type

247 (Pipe(..), PipeState(..), Step(..), zipWith, tee, map, compose)

248−-- import Streamly.Internal.Data.Array.Unboxed.Type (Array)

248+-- import Streamly.Internal.Data.Array.Type (Array)

249-- import Streamly.Internal.Data.Ring.Unboxed (Ring)

250-- import Streamly.Internal.Data.Stream (Stream)

251-- import Streamly.Internal.Data.Time.Units

@@ -254,7 +254,7 @@ import Streamly.Internal.Data.Pipe.Type

254

255-- import Streamly.Internal.Data.Strict

256

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

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

258-- import qualified Streamly.Prelude as S

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

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

core/src/Streamly/Internal/Data/Ring/Unboxed.hs+3−3

@@ -87,15 +87,15 @@ import Streamly.Internal.Data.Unboxed as Unboxed

87 )

88import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)

89import GHC.Ptr (Ptr(..))

90−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (Array)

90+import Streamly.Internal.Data.Array.Mut.Type (Array)

91import Streamly.Internal.Data.Fold.Type (Fold(..), Step(..), lmap)

92import Streamly.Internal.Data.Stream.Type (Stream)

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

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

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

96

97−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

97+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

98−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

98+import qualified Streamly.Internal.Data.Array.Type as A

99

100import Prelude hiding (length, concat, read)

101

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

@@ -76,7 +76,7 @@ import Streamly.Internal.Data.Producer.Type (Producer(..))

76import Streamly.Internal.System.IO (defaultChunkSize)

77import Streamly.Internal.Data.SVar.Type (defState)

78

79−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

79+import qualified Streamly.Internal.Data.Array.Type as A

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

81import qualified Streamly.Internal.Data.Stream.StreamK as K

82import qualified Streamly.Internal.Data.Stream.StreamD as D

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

96-- >>> import Prelude hiding (take, takeWhile, drop, reverse)

97-- >>> import System.IO.Unsafe (unsafePerformIO)

98-- >>> import Streamly.Internal.Data.Stream as Stream

99−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

99+-- >>> import qualified Streamly.Data.Array as Array

100-- >>> import qualified Streamly.Internal.Data.Fold as Fold

101-- >>> import qualified Streamly.Internal.Data.Parser as Parser

102-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

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

@@ -84,7 +84,7 @@ import Control.Monad.Trans.Class (MonadTrans(..))

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

85import Streamly.Internal.Data.Unboxed (Unbox)

86

87−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

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

89import qualified Streamly.Internal.Data.Parser.ParserD as PRD

90import qualified Streamly.Internal.Data.Parser.ParserK.Type as PRK

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

@@ -147,7 +147,7 @@ import Prelude hiding (concat, concatMap, zipWith)

147-- >>> import Data.IORef

148-- >>> import Streamly.Internal.Data.Stream (Stream)

149-- >>> import Prelude hiding (zipWith, concatMap, concat)

150−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

150+-- >>> import qualified Streamly.Data.Array as Array

151-- >>> import qualified Streamly.Internal.Data.Fold as Fold

152-- >>> import qualified Streamly.Internal.Data.Stream as Stream

153-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

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

@@ -58,7 +58,7 @@ where

58

59import Control.Monad.Catch (MonadThrow)

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

61−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

61+import Streamly.Internal.Data.Array.Type (Array)

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

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

64import Streamly.Internal.Data.Refold.Type (Refold (..))

@@ -66,7 +66,7 @@ import Streamly.Internal.Data.Stream.Bottom (foldManyPost)

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

67import Streamly.Internal.Data.Unboxed (Unbox)

68

69−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

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

71import qualified Streamly.Internal.Data.Stream.StreamD as D

72

@@ -80,7 +80,7 @@ import Prelude hiding (concatMap, map)

80-- >>> import qualified Streamly.Internal.Data.Fold as Fold

81-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

82-- >>> import qualified Streamly.Internal.Data.Parser as Parser

83−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

83+-- >>> import qualified Streamly.Data.Array as Array

84

85------------------------------------------------------------------------------

86-- Trimming

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

@@ -159,7 +159,7 @@ import Foreign.Storable (peek, sizeOf)

159import Fusion.Plugin.Types (Fuse(..))

160import GHC.Types (SPEC(..))

161

162−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

162+import Streamly.Internal.Data.Array.Type (Array(..))

163import Streamly.Internal.Data.Fold.Step (Step(..))

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

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

@@ -169,7 +169,7 @@ import Streamly.Internal.Data.Tuple.Strict (Tuple'(..))

169import Streamly.Internal.Data.Unboxed (Unbox)

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

171

172−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

172+import qualified Streamly.Internal.Data.Array.Type as A

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

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

175import qualified Streamly.Internal.Data.Parser.ParserD as PRD

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

@@ -963,7 +963,7 @@ reverse' :: forall m a. (MonadIO m, Storable a) => Stream m a -> Stream m a

963import Foreign.ForeignPtr (touchForeignPtr)

964import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

965import Foreign.Ptr (Ptr, plusPtr)

966−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (sizeOfElem)

966+import Streamly.Internal.Data.Array.Mut.Type (sizeOfElem)

967reverse' m = Stream step Nothing

968 where

969 {-# INLINE_LATE step #-}

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

@@ -54,7 +54,7 @@ import Streamly.Internal.Data.Stream.Type (Stream, fromStreamD, toStreamD)

54

55import qualified Data.List as List

56import qualified Streamly.Internal.Data.Array.Generic as Array

57−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

57+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

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

60import qualified Streamly.Internal.Data.Stream.Lift as Stream

core/src/Streamly/Internal/FileSystem/Dir.hs+4−4

@@ -155,9 +155,9 @@ toChunks = toChunksWithBufferOf defaultChunkSize

155

156-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

157-- device are performed using a buffer of size

158−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

158+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

159-- size of arrays in the resulting stream are therefore less than or equal to

160−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

160+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

161--

162-- @since 0.7.0

163{-# INLINE readChunks #-}

@@ -351,7 +351,7 @@ fromStreamWithBufferOf n h m = fromChunks h $ S.arraysOf n m

351-- > write = 'writeWithBufferOf' A.defaultChunkSize

352--

353-- | Write a byte stream to a file handle. Accumulates the input in chunks of

354−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing.

354+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing.

355--

356-- NOTE: This may perform better than the 'write' fold, you can try this if you

357-- need some extra perf boost.

@@ -401,7 +401,7 @@ writeWithBufferOf n h = FL.chunksOf n (writeNUnsafe n) (writeChunks h)

401-- > write = 'writeWithBufferOf' A.defaultChunkSize

402--

403-- | Write a byte stream to a file handle. Accumulates the input in chunks of

404−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing

404+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing

405-- to the IO device.

406--

407-- @since 0.7.0

core/src/Streamly/Internal/FileSystem/File.hs+7−7

@@ -104,20 +104,20 @@ import qualified Control.Monad.Catch as MC

104import qualified System.IO as SIO

105

106import Streamly.Data.Fold (chunksOf, drain)

107−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..), writeNUnsafe)

107+import Streamly.Internal.Data.Array.Type (Array(..), writeNUnsafe)

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

109import Streamly.Data.Stream (Stream)

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

111-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

112import Streamly.Internal.System.IO (defaultChunkSize)

113

114−import qualified Streamly.Data.Array.Unboxed as A

114+import qualified Streamly.Data.Array as A

115import qualified Streamly.Data.Unfold as UF

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

117 (Step(..), snoc, reduce)

118import qualified Streamly.Internal.Data.Unfold as UF (bracketIO)

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

120−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

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

121import qualified Streamly.Data.Stream as S (fold, bracketIO, mapM)

122

123-------------------------------------------------------------------------------

@@ -303,9 +303,9 @@ readChunksFromToWith = chunkReaderFromToWith

303

304-- | Unfolds a 'FilePath' into a stream of 'Word8' arrays. Requests to the IO

305-- device are performed using a buffer of size

306−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

306+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

307-- size of arrays in the resulting stream are therefore less than or equal to

308−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

308+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

309--

310-- /Pre-release/

311{-# INLINE chunkReader #-}

@@ -328,7 +328,7 @@ readWithBufferOf = readerWith

328

329-- | Unfolds a file path into a byte stream. IO requests to the device are

330-- performed in sizes of

331−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

331+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

332--

333-- /Pre-release/

334{-# INLINE reader #-}

@@ -465,7 +465,7 @@ writeWithBufferOf = writeWith

465-- > write = 'writeWith' A.defaultChunkSize

466--

467-- | Write a byte stream to a file. Accumulates the input in chunks of up to

468−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing to

468+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing to

469-- the IO device.

470--

471-- /Pre-release/

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

@@ -122,18 +122,18 @@ import Prelude hiding (read)

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

123import Streamly.Internal.Data.Refold.Type (Refold(..))

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

125−import Streamly.Internal.Data.Array.Unboxed.Type

125+import Streamly.Internal.Data.Array.Type

126 (Array(..), writeNUnsafe, unsafeFreezeWithShrink, byteLength)

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

128−import Streamly.Internal.Data.Array.Unboxed.Stream (lpackArraysChunksOf)

128+import Streamly.Internal.Data.Array.Stream (lpackArraysChunksOf)

129-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

130import Streamly.Internal.System.IO (defaultChunkSize)

131

132import qualified Streamly.Data.Fold as FL

133−import qualified Streamly.Data.Array.Unboxed as A

133+import qualified Streamly.Data.Array as A

134−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

134+import qualified Streamly.Internal.Data.Array.Type as A

135−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

135+import qualified Streamly.Internal.Data.Array.Stream as AS

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

136+import 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)

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

@@ -143,12 +143,12 @@ import qualified Streamly.Internal.Data.Unfold as UF

143import qualified Streamly.Internal.Data.Stream.StreamK.Type as K (mkStream)

144

145-- $setup

146−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

146+-- >>> import qualified Streamly.Data.Array as Array

147-- >>> import qualified Streamly.Data.Fold as Fold

148-- >>> import qualified Streamly.Data.Unfold as Unfold

149-- >>> import qualified Streamly.Data.Stream as Stream

150--

151−-- >>> import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array (writeNUnsafe)

151+-- >>> import qualified Streamly.Internal.Data.Array.Type as Array (writeNUnsafe)

152-- >>> import qualified Streamly.Internal.Data.Stream as Stream

153-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold (first)

154-- >>> import qualified Streamly.Internal.FileSystem.Handle as Handle

@@ -306,9 +306,9 @@ readChunks = readChunksWith defaultChunkSize

306

307-- | Unfolds a handle into a stream of 'Word8' arrays. Requests to the IO

308-- device are performed using a buffer of size

309−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

309+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

310-- size of arrays in the resulting stream are therefore less than or equal to

311−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

311+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

312--

313-- >>> chunkReader = Unfold.first IO.defaultChunkSize Handle.chunkReaderWith

314--

@@ -352,7 +352,7 @@ readWith size h = AS.concat $ readChunksWith size h

352

353-- | Unfolds a file handle into a byte stream. IO requests to the device are

354-- performed in sizes of

355−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

355+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

356--

357-- >>> reader = Unfold.many Array.reader chunkReader

358--

@@ -434,7 +434,7 @@ putBytesWith n h m = putChunks h $ S.arraysOf n m

434-- putBytesWith n h m = putChunks h $ AS.arraysOf n m

435

436-- | Write a byte stream to a file handle. Accumulates the input in chunks of

437−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing.

437+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing.

438--

439-- NOTE: This may perform better than the 'write' fold, you can try this if you

440-- need some extra perf boost.

@@ -531,7 +531,7 @@ writerWith n =

531 FL.refoldMany (FL.take n $ writeNUnsafe n) chunkWriter

532

533-- | Write a byte stream to a file handle. Accumulates the input in chunks of

534−-- up to 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize' before writing

534+-- up to 'Streamly.Internal.Data.Array.Type.defaultChunkSize' before writing

535-- to the IO device.

536--

537-- >>> write = Handle.writeWith IO.defaultChunkSize

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

@@ -24,9 +24,9 @@ where

24

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

26import Streamly.Data.Stream (Stream)

27−import Streamly.Internal.Data.Array.Unboxed (Array)

27+import Streamly.Internal.Data.Array (Array)

28

29−import qualified Streamly.Data.Array.Unboxed as A

29+import qualified Streamly.Data.Array as A

30import qualified Streamly.Internal.Unicode.Stream as S

31

32import Prelude hiding (String, lines, words, unlines, unwords)

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

@@ -103,8 +103,8 @@ import GHC.Exts (Addr#)

103import GHC.IO.Encoding.Failure (isSurrogate)

104import GHC.Ptr (Ptr (..), plusPtr)

105import System.IO.Unsafe (unsafePerformIO)

106−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

106+import Streamly.Internal.Data.Array.Type (Array(..))

107−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (MutableByteArray)

107+import Streamly.Internal.Data.Array.Mut.Type (MutableByteArray)

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

109import Streamly.Internal.Data.Stream (Stream, fromStreamD, toStreamD)

110import Streamly.Internal.Data.Stream.StreamD (Step (..))

@@ -116,7 +116,7 @@ import Streamly.Internal.System.IO (unsafeInlineIO)

116

117import qualified Streamly.Data.Fold as Fold

118import qualified Streamly.Data.Unfold as Unfold

119−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

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

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

122import qualified Streamly.Internal.Data.Stream as Stream

core/src/Streamly/Unicode/Stream.hs+3−3

@@ -12,11 +12,11 @@

12-- A 'Char' stream is the canonical representation to process Unicode strings.

13-- It can be processed efficiently using regular stream processing operations.

14-- A byte stream of Unicode text read from an IO device or from an

15−-- 'Streamly.Data.Array.Unboxed.Array' in memory can be decoded into a 'Char' stream

15+-- 'Streamly.Data.Array.Array' in memory can be decoded into a 'Char' stream

16-- using the decoding routines in this module. A 'String' (@[Char]@) can be

17-- converted into a 'Char' stream using 'Streamly.Prelude.fromList'. An @Array

18-- Char@ can be 'Streamly.Prelude.unfold'ed into a stream using the array

19−-- 'Streamly.Data.Array.Unboxed.read' unfold.

19+-- 'Streamly.Data.Array.read' unfold.

20--

21-- = Storing Unicode Strings

22--

@@ -30,7 +30,7 @@

30-- than pinned arrays for short and short lived strings.

31--

32-- For longer or long lived streams you can 'Streamly.Prelude.fold' the 'Char'

33−-- stream as @Array Char@ using the array 'Streamly.Data.Array.Unboxed.write' fold.

33+-- stream as @Array Char@ using the array 'Streamly.Data.Array.write' fold.

34-- The 'Array' type provides a more compact representation and pinned memory

35-- reducing GC overhead. If space efficiency is a concern you can use

36-- 'encodeUtf8'' on the 'Char' stream before writing it to an 'Array' providing

core/streamly-core.cabal+12−12

@@ -274,9 +274,9 @@ library

274 -- Unboxed IORef

275 , Streamly.Internal.Data.IORef.Unboxed

276 -- May depend on streamly-core-stream

277− , Streamly.Internal.Data.Array.Unboxed.Mut.Type

277+ , Streamly.Internal.Data.Array.Mut.Type

278− , Streamly.Internal.Data.Array.Unboxed.Mut

278+ , Streamly.Internal.Data.Array.Mut

279− , Streamly.Internal.Data.Array.Unboxed.Type

279+ , Streamly.Internal.Data.Array.Type

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

281

282 -- streamly-core-streams

@@ -319,10 +319,10 @@ library

319

320 -- streamly-core-data-arrays

321 , Streamly.Internal.Data.Array.Generic

322− , Streamly.Internal.Data.Array.Unboxed

322+ , Streamly.Internal.Data.Array

323− , Streamly.Internal.Data.Array.Unboxed.Mut.Stream

323+ , Streamly.Internal.Data.Array.Mut.Stream

324− , Streamly.Internal.Data.Array.Unboxed.Fold

324+ , Streamly.Internal.Data.Array.Fold

325− , Streamly.Internal.Data.Array.Unboxed.Stream

325+ , Streamly.Internal.Data.Array.Stream

326

327 -- streamly-serde

328 , Streamly.Internal.Data.Binary.Decode

@@ -356,9 +356,9 @@ library

356 -- Pre-release modules

357 -- , Streamly.Data.Fold.Window

358 -- , Streamly.Data.Pipe

359− -- , Streamly.Data.Array.Unboxed.Stream

359+ -- , Streamly.Data.Array.Stream

360− -- , Streamly.Data.Array.Unboxed.Fold

360+ -- , Streamly.Data.Array.Fold

361− -- , Streamly.Data.Array.Unboxed.Mut.Stream

361+ -- , Streamly.Data.Array.Mut.Stream

362 -- , Streamly.Data.Ring

363 -- , Streamly.Data.Ring.Unboxed

364 -- , Streamly.Data.IORef.Unboxed

@@ -376,8 +376,8 @@ library

376 -- NOTE: these must be added to streamly.cabal as well

377 , Streamly.Console.Stdio

378 , Streamly.Data.Array.Generic

379− , Streamly.Data.Array.Unboxed

379+ , Streamly.Data.Array

380− , Streamly.Data.Array.Unboxed.Mut

380+ , Streamly.Data.Array.Mut

381 , Streamly.Data.Fold

382 , Streamly.Data.Fold.Tee

383 , Streamly.Data.Parser

docs/User/ProjectRelated/Changelog.md+2−2

@@ -6,7 +6,7 @@

6* Remove support for GHC 8.4.*

7* New modules for unboxed mutable & unboxed immutable arrays are added.

8* The unboxed arrays now require `Unbox` instead of `Storable` for the stored

9− type. The `Unbox` typeclass can be found in `Streamly.Data.Array.Unboxed`.

9+ type. The `Unbox` typeclass can be found in `Streamly.Data.Array`.

10

11* Following APIs have been renamed in Streamly.Network.Socket module:

12 readWithBufferOf -> readWith

@@ -25,7 +25,7 @@

25* In `Streamly.Data.Fold`:

26 * `variance`, and `stdDev` have been deprecated. Please use the

27 `streamly-statistics` package instead.

28−* `Streamly.Data.Array.Foreign` is deprecated. Use `Streamly.Data.Array.Unboxed`

28+* `Streamly.Data.Array.Foreign` is deprecated. Use `Streamly.Data.Array`

29 instead.

30* The type of `replicateM` in `Streamly.Data.Unfold` is changed.

31

hie.yaml+8−8

@@ -16,8 +16,8 @@ cradle:

16 config:

17 cradle:

18 cabal:

19− - path: "./benchmark/Streamly/Benchmark/Data/Array/Stream/Unboxed.hs"

19+ - path: "./benchmark/Streamly/Benchmark/Data/Array/Stream.hs"

20− component: "bench:Data.Array.Unboxed.Stream"

20+ component: "bench:Data.Array.Stream"

21 - path: "./benchmark/Streamly/Benchmark/Data/Fold.hs"

22 component: "bench:Data.Fold"

23 - path: "./benchmark/Streamly/Benchmark/Data/Parser.hs"

@@ -80,12 +80,12 @@ cradle:

80 cabal:

81 - path: "./test/Streamly/Test/Data/Array.hs"

82 component: "test:Data.Array"

83− - path: "./test/Streamly/Test/Data/Array/Unboxed.hs"

83+ - path: "./test/Streamly/Test/Data/Array.hs"

84− component: "test:Data.Array.Unboxed"

84+ component: "test:Data.Array"

85− - path: "./test/Streamly/Test/Data/Array/Unboxed/Mut.hs"

85+ - path: "./test/Streamly/Test/Data/Array/Mut.hs"

86− component: "test:Data.Array.Unboxed.Mut"

86+ component: "test:Data.Array.Mut"

87− - path: "./test/Streamly/Test/Data/Array/Stream/Unboxed.hs"

87+ - path: "./test/Streamly/Test/Data/Array/Stream.hs"

88− component: "test:Data.Array.Unboxed.Stream"

88+ component: "test:Data.Array.Stream"

89 - path: "./test/Streamly/Test/Data/Fold.hs"

90 component: "test:Data.Fold"

91 - path: "./test/Streamly/Test/Data/List.hs"

src/Streamly/Data/Array/Foreign.hs+6−6

@@ -47,12 +47,12 @@

47--

48-- This module is designed to be imported qualified:

49--

50−-- > import qualified Streamly.Data.Array.Unboxed as Array

50+-- > import qualified Streamly.Data.Array as Array

51--

52−-- For experimental APIs see "Streamly.Internal.Data.Array.Unboxed".

52+-- For experimental APIs see "Streamly.Internal.Data.Array".

53

54module Streamly.Data.Array.Foreign

55− {-# DEPRECATED "Please use \"Streamly.Data.Array.Unboxed\" instead." #-}

55+ {-# DEPRECATED "Please use \"Streamly.Data.Array\" instead." #-}

56 (

57 A.Array

58

@@ -93,7 +93,7 @@ module Streamly.Data.Array.Foreign

93 )

94where

95

96−import Streamly.Internal.Data.Array.Unboxed as A

96+import Streamly.Internal.Data.Array as A

97

98-- $setup

99-- >>> :m

@@ -101,6 +101,6 @@ import Streamly.Internal.Data.Array.Unboxed as A

101-- >>> :set -XFlexibleContexts

102-- >>> :set -package streamly

103-- >>> import Streamly.Internal.Data.Stream (Stream)

104−-- >>> import Streamly.Data.Array.Unboxed (Array)

104+-- >>> import Streamly.Data.Array (Array)

105-- >>> import qualified Streamly.Internal.Data.Stream.IsStream as Stream

106−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

106+-- >>> import qualified Streamly.Data.Array as Array

src/Streamly/Internal/Data/Fold/Concurrent.hs+1−1

@@ -45,7 +45,7 @@ import Streamly.Internal.Data.Fold.Concurrent.Channel

45--

46-- >>> :m

47-- >>> import Control.Concurrent (threadDelay)

48−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

48+-- >>> import qualified Streamly.Data.Array as Array

49-- >>> import qualified Streamly.Data.Fold as Fold

50-- >>> import qualified Streamly.Data.Parser as Parser

51-- >>> import qualified Streamly.Data.Stream as Stream

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

@@ -135,7 +135,7 @@ import Streamly.Internal.Data.Stream.Concurrent.Channel

135-- >>> :m

136-- >>> {-# LANGUAGE FlexibleContexts #-}

137-- >>> import Control.Concurrent (threadDelay)

138−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

138+-- >>> import qualified Streamly.Data.Array as Array

139-- >>> import qualified Streamly.Data.Fold as Fold

140-- >>> import qualified Streamly.Data.Parser as Parser

141-- >>> import qualified Streamly.Data.Stream as Stream

src/Streamly/Internal/Data/Stream/IsStream/Common.hs+3−3

@@ -71,7 +71,7 @@ where

71import Control.Concurrent (threadDelay)

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

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

74−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

74+import Streamly.Internal.Data.Array.Type (Array)

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

76import Streamly.Internal.Data.Stream.IsStream.Combinators (maxYields)

77import Streamly.Internal.Data.Stream.IsStream.Type

@@ -82,7 +82,7 @@ import Streamly.Internal.System.IO (defaultChunkSize)

82import Streamly.Internal.Data.Unboxed (Unbox)

83

84import qualified Streamly.Data.Stream as Stream (fold, foldBreak)

85−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

85+import qualified Streamly.Internal.Data.Array.Type as A

86import qualified Streamly.Internal.Data.Stream.Async as Async

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

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

@@ -109,7 +109,7 @@ import Prelude hiding (take, takeWhile, drop, reverse, concatMap, map, zipWith)

109-- >>> import System.IO.Unsafe (unsafePerformIO)

110-- >>> import qualified Streamly.Prelude as Stream

111-- >>> import Streamly.Internal.Data.Stream.IsStream as Stream

112−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

112+-- >>> import qualified Streamly.Data.Array as Array

113-- >>> import qualified Streamly.Data.Fold as Fold

114-- >>> import qualified Streamly.Internal.Data.Fold as Fold

115-- >>> import qualified Streamly.Data.Unfold as Unfold

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

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

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

169import Streamly.Internal.Data.Unboxed (Unbox)

170

171−import qualified Streamly.Data.Array.Unboxed as A

171+import qualified Streamly.Data.Array as A

172import qualified Streamly.Data.Stream as Stream

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

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

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

@@ -202,7 +202,7 @@ import Prelude hiding (concat, concatMap, zipWith)

202-- >>> import qualified Streamly.Internal.Data.Fold as Fold

203-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

204-- >>> import qualified Streamly.Internal.Data.Parser as Parser

205−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

205+-- >>> import qualified Streamly.Data.Array as Array

206-- >>> :{

207-- delay n = do

208-- threadDelay (n * 1000000) -- sleep for n seconds

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

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

164import Streamly.Internal.Data.IsMap (IsMap(..))

165import Streamly.Internal.Data.Refold.Type (Refold (..))

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

167−import Streamly.Internal.Data.Array.Unboxed.Type (Array)

167+import Streamly.Internal.Data.Array.Type (Array)

168import Streamly.Internal.Data.Stream.IsStream.Common

169 ( fold

170 , interjectSuffix

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

183

184import qualified Data.Heap as H

185import qualified Streamly.Data.Unfold as Unfold

186−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

186+import qualified Streamly.Internal.Data.Array.Type as A

187 (arraysOf, read)

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

189 (Fold, Step(..), takeEndBy_, takeEndBy, catMaybes, take)

@@ -221,7 +221,7 @@ import Prelude hiding (concatMap, map)

221-- >>> import qualified Streamly.Internal.Data.Fold as Fold

222-- >>> import qualified Streamly.Internal.Data.Unfold as Unfold

223-- >>> import qualified Streamly.Internal.Data.Parser as Parser

224−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

224+-- >>> import qualified Streamly.Data.Array as Array

225

226------------------------------------------------------------------------------

227-- Trimming

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

@@ -71,7 +71,7 @@ import qualified Data.List as List

71import qualified Data.Map.Strict as Map

72import qualified Streamly.Internal.Data.Array.Generic as Array

73 (fromStream, length, read)

74−import qualified Streamly.Data.Array.Unboxed.Mut as MA

74+import qualified Streamly.Data.Array.Mut as MA

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

76 (one, last, toStream, toStreamRev)

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

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

@@ -85,7 +85,7 @@ import Streamly.Internal.Data.Stream.Concurrent

85--

86-- >>> :m

87-- >>> import Control.Concurrent (threadDelay)

88−-- >>> import qualified Streamly.Data.Array.Unboxed as Array

88+-- >>> import qualified Streamly.Data.Array as Array

89-- >>> import qualified Streamly.Data.Fold as Fold

90-- >>> import qualified Streamly.Data.Parser as Parser

91-- >>> import qualified Streamly.Data.Stream as Stream

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

@@ -47,7 +47,7 @@ where

47

48import Data.List.NonEmpty (NonEmpty)

49import Data.Word (Word8)

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

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

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

52

53#if defined(CABAL_OS_DARWIN)

src/Streamly/Internal/FileSystem/Event/Darwin.hs+2−2

@@ -176,7 +176,7 @@ import GHC.IO.Handle.FD (fdToHandle)

176import Streamly.Internal.Data.Stream (Stream)

177import Streamly.Internal.Data.Cont (contListMap)

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

179−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

179+import Streamly.Internal.Data.Array.Type (Array(..))

180import System.IO (Handle, hClose)

181

182import qualified Data.List.NonEmpty as NonEmpty

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

184import qualified Streamly.Internal.Data.Stream.IsStream as S

185import qualified Streamly.Internal.Unicode.Stream as U

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

187−import qualified Streamly.Internal.Data.Array.Unboxed as A

187+import qualified Streamly.Internal.Data.Array as A

188

189-------------------------------------------------------------------------------

190-- Subscription to events

src/Streamly/Internal/FileSystem/Event/Linux.hs+2−2

@@ -173,14 +173,14 @@ import GHC.IO.FD (fdFD, mkFD)

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

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

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

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

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

177import System.Directory (doesDirectoryExist)

178import System.IO (Handle, hClose, IOMode(ReadMode))

179import GHC.IO.Handle.FD (handleToFd)

180

181import qualified Data.IntMap.Lazy as Map

182import qualified Data.List.NonEmpty as NonEmpty

183−import qualified Streamly.Internal.Data.Array.Unboxed as A

183+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)

src/Streamly/Internal/FileSystem/Event/Windows.hs+2−2

@@ -123,9 +123,9 @@ import qualified Streamly.Data.Fold as Fold

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

124import qualified Streamly.Internal.Unicode.Stream as U

125import qualified Streamly.Internal.Unicode.Utf8 as UTF8

126−import qualified Streamly.Internal.Data.Array.Unboxed as A

126+import qualified Streamly.Internal.Data.Array as A

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

128−import Streamly.Internal.Data.Array.Unboxed (Array)

128+import Streamly.Internal.Data.Array (Array)

129

130-- | Watch configuration, used to specify the events of interest and the

131-- behavior of the watch.

src/Streamly/Internal/FileSystem/FD.hs+4−4

@@ -128,7 +128,7 @@ import Prelude hiding (read)

128import qualified GHC.IO.FD as FD

129import qualified GHC.IO.Device as RawIO

130

131−import Streamly.Internal.Data.Array.Unboxed.Type

131+import Streamly.Internal.Data.Array.Type

132 (Array(..), byteLength, unsafeFreeze, asPtrUnsafe)

133import Streamly.Internal.System.IO (defaultChunkSize)

134import Streamly.Internal.Data.Stream.Type (Stream)

@@ -143,11 +143,11 @@ import qualified Streamly.Internal.System.IOVec.Type as RawIO

143-- import Streamly.Data.Fold (Fold)

144-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

145

146−import qualified Streamly.Data.Array.Unboxed as A

146+import qualified Streamly.Data.Array as A

147import qualified Streamly.Data.Fold as FL

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

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

149 (Array(..), newPinnedBytes, asPtrUnsafe)

150−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

150+import qualified Streamly.Internal.Data.Array.Stream as AS

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

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

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

src/Streamly/Internal/Network/Inet/TCP.hs+3−3

@@ -106,7 +106,7 @@ import Prelude hiding (read)

106

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

108import Streamly.Internal.Control.ForkLifted (fork)

109−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..), writeNUnsafe)

109+import Streamly.Internal.Data.Array.Type (Array(..), writeNUnsafe)

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

111import Streamly.Data.Stream (Stream)

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

@@ -117,11 +117,11 @@ import Streamly.Internal.System.IO (defaultChunkSize)

117import qualified Control.Monad.Catch as MC

118import qualified Network.Socket as Net

119

120−import qualified Streamly.Data.Array.Unboxed as A

120+import qualified Streamly.Data.Array as A

121import qualified Streamly.Data.Fold as FL

122import qualified Streamly.Data.Unfold as UF

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

124−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

124+import qualified Streamly.Internal.Data.Array.Stream as AS

125import qualified Streamly.Internal.Data.Fold.Type as FL (Step(..))

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

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

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

@@ -86,21 +86,21 @@ import Prelude hiding (read)

86

87import qualified Network.Socket as Net

88

89−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

89+import Streamly.Internal.Data.Array.Type (Array(..))

90−import Streamly.Internal.Data.Array.Unboxed.Stream (lpackArraysChunksOf)

90+import Streamly.Internal.Data.Array.Stream (lpackArraysChunksOf)

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

92import Streamly.Internal.Data.Stream.Type (Stream)

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

94-- import Streamly.String (encodeUtf8, decodeUtf8, foldLines)

95import Streamly.Internal.System.IO (defaultChunkSize)

96

97−import qualified Streamly.Data.Array.Unboxed as A (reader, length, writeN)

97+import qualified Streamly.Data.Array as A (reader, length, writeN)

98import qualified Streamly.Data.Fold as FL

99−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

99+import qualified Streamly.Internal.Data.Array.Type as A

100 (unsafeFreeze, asPtrUnsafe, byteLength, writeNUnsafe)

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

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

102 (Array(..), newPinnedBytes, asPtrUnsafe)

103−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

103+import qualified Streamly.Internal.Data.Array.Stream as AS

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

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

106 (Stream(..), Step(..))

@@ -391,9 +391,9 @@ readChunksWithBufferOf = chunkReaderWith

391

392-- | Unfolds a socket into a stream of 'Word8' arrays. Requests to the socket

393-- are performed using a buffer of size

394−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. The

394+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. The

395-- size of arrays in the resulting stream are therefore less than or equal to

396−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

396+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

397--

398{-# INLINE chunkReader #-}

399chunkReader :: MonadIO m => Unfold m Socket (Array Word8)

@@ -435,7 +435,7 @@ readWithBufferOf = readerWith

435

436-- | Unfolds a 'Socket' into a byte stream. IO requests to the socket are

437-- performed in sizes of

438−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'.

438+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'.

439--

440{-# INLINE reader #-}

441reader :: MonadIO m => Unfold m Socket Word8

src/Streamly/Internal/System/IOVec.hs+6−6

@@ -30,12 +30,12 @@ where

30import Control.Monad (when)

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

32import Foreign.Ptr (castPtr)

33−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (length)

33+import Streamly.Internal.Data.Array.Mut.Type (length)

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

35−import Streamly.Internal.Data.Array.Unboxed.Mut.Type (Array(..))

35+import Streamly.Internal.Data.Array.Mut.Type (Array(..))

36

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

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

38−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MArray

38+import qualified Streamly.Internal.Data.Array.Mut.Type as MArray

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

40-}

41#endif

@@ -69,11 +69,11 @@ groupIOVecsOfMut n maxIOVLen (D.Stream step state) =

69 step' gst (GatherInitial st) = do

70 when (n <= 0) $

71 -- XXX we can pass the module string from the higher level API

72− error $ "Streamly.Internal.Data.Array.Unboxed.Mut.Type.groupIOVecsOf: the size of "

72+ error $ "Streamly.Internal.Data.Array.Mut.Type.groupIOVecsOf: the size of "

73 ++ "groups [" ++ show n ++ "] must be a natural number"

74 when (maxIOVLen <= 0) $

75 -- XXX we can pass the module string from the higher level API

76− error $ "Streamly.Internal.Data.Array.Unboxed.Mut.Type.groupIOVecsOf: the number of "

76+ error $ "Streamly.Internal.Data.Array.Mut.Type.groupIOVecsOf: the number of "

77 ++ "IOVec entries [" ++ show n ++ "] must be a natural number"

78 r <- step (adaptState gst) st

79 case r of

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

@@ -29,12 +29,12 @@ where

29

30import Control.DeepSeq (NFData)

31import Data.Word (Word8)

32−import Streamly.Data.Array.Unboxed (Array)

32+import Streamly.Data.Array (Array)

33import System.IO.Unsafe (unsafePerformIO)

34

35import qualified Streamly.Data.Fold as Fold

36import qualified Streamly.Data.Stream as Stream

37−import qualified Streamly.Internal.Data.Array.Unboxed as Array

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

38 ( fromStreamN

39 , read

40 )

src/Streamly/Memory/Array.hs+2−2

@@ -32,7 +32,7 @@

32--

33-- > import qualified Streamly.Array as A

34--

35−-- For experimental APIs see "Streamly.Internal.Data.Array.Unboxed".

35+-- For experimental APIs see "Streamly.Internal.Data.Array".

36

37module Streamly.Memory.Array

38 {-# DEPRECATED "Use Streamly.Data.Array.Foreign instead" #-}

@@ -71,4 +71,4 @@ module Streamly.Memory.Array

71 )

72where

73

74−import Streamly.Internal.Data.Array.Unboxed as A

74+import Streamly.Internal.Data.Array as A

src/Streamly/Network/Socket.hs+2−2

@@ -61,7 +61,7 @@

61-- = Programmer Notes

62--

63-- Read IO requests to connected stream sockets are performed in chunks of

64−-- 'Streamly.Internal.Data.Array.Unboxed.Type.defaultChunkSize'. Unless

64+-- 'Streamly.Internal.Data.Array.Type.defaultChunkSize'. Unless

65-- specified otherwise in the API, writes are collected into chunks of

66-- 'Streamly.Internal.System.IO.defaultChunkSize' before they are written to

67-- the socket.

@@ -137,7 +137,7 @@ import Control.Monad.IO.Class (MonadIO(..))

137import Data.Word (Word8)

138import Network.Socket (Socket, SockAddr)

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

140−import Streamly.Internal.Data.Array.Unboxed.Type (Array(..))

140+import Streamly.Internal.Data.Array.Type (Array(..))

141import Streamly.Internal.Data.Unboxed (Unbox)

142

143import Streamly.Internal.Network.Socket hiding (accept, read, readChunks)

streamly.cabal+8−8

@@ -56,10 +56,10 @@ extra-source-files:

56 benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs

57 benchmark/Streamly/Benchmark/Data/Array/Generic.hs

58 benchmark/Streamly/Benchmark/Data/Array/SmallArray.hs

59− benchmark/Streamly/Benchmark/Data/Array/Unboxed.hs

59+ benchmark/Streamly/Benchmark/Data/Array.hs

60 benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs

61− benchmark/Streamly/Benchmark/Data/Array/Unboxed/Mut.hs

61+ benchmark/Streamly/Benchmark/Data/Array/Mut.hs

62− benchmark/Streamly/Benchmark/Data/Array/Stream/Unboxed.hs

62+ benchmark/Streamly/Benchmark/Data/Array/Stream.hs

63 benchmark/Streamly/Benchmark/Data/Fold/Window.hs

64 benchmark/Streamly/Benchmark/Data/Parser/*.hs

65 benchmark/Streamly/Benchmark/Data/Stream/*.hs

@@ -93,10 +93,10 @@ extra-source-files:

93 test/Streamly/Test/Data/Array/CommonImports.hs

94 test/Streamly/Test/Data/Array/Common.hs

95 test/Streamly/Test/Data/Array/Generic.hs

96− test/Streamly/Test/Data/Array/Unboxed.hs

96+ test/Streamly/Test/Data/Array.hs

97− test/Streamly/Test/Data/Array/Unboxed/Mut.hs

97+ test/Streamly/Test/Data/Array/Mut.hs

98 test/Streamly/Test/Data/Ring/Unboxed.hs

99− test/Streamly/Test/Data/Array/Stream/Unboxed.hs

99+ test/Streamly/Test/Data/Array/Stream.hs

100 test/Streamly/Test/Data/Parser/ParserD.hs

101 test/Streamly/Test/Data/Stream/Concurrent.hs

102 test/Streamly/Test/FileSystem/Event.hs

@@ -436,8 +436,8 @@ library

436 -- streamly-core exposed modules

437 , Streamly.Console.Stdio

438 , Streamly.Data.Array.Generic

439− , Streamly.Data.Array.Unboxed

439+ , Streamly.Data.Array

440− , Streamly.Data.Array.Unboxed.Mut

440+ , Streamly.Data.Array.Mut

441 , Streamly.Data.Fold

442 , Streamly.Data.Fold.Tee

443 , Streamly.Data.Parser

test/Streamly/Test/Data/Array/Unboxed.hs → test/Streamly/Test/Data/Array.hsrenamed+6−6

@@ -1,12 +1,12 @@

1-- |

2−-- Module : Streamly.Test.Data.Array.Unboxed

2+-- Module : Streamly.Test.Data.Array

4-- License : BSD-3-Clause

5-- Maintainer : streamly@composewell.com

6-- Stability : experimental

7-- Portability : GHC

8

9−module Streamly.Test.Data.Array.Unboxed (main) where

9+module Streamly.Test.Data.Array (main) where

10

11import Data.Char (isLower)

12import Data.List (sort)

@@ -19,9 +19,9 @@ import Streamly.Internal.Data.Unboxed (Unbox, sizeOf)

19import Streamly.Test.Common (listEquals)

20

21import qualified Streamly.Data.Fold as Fold

22−import qualified Streamly.Internal.Data.Array.Unboxed as A

22+import qualified Streamly.Internal.Data.Array as A

23−import qualified Streamly.Internal.Data.Array.Unboxed.Type as A

23+import qualified Streamly.Internal.Data.Array.Type as A

24−import qualified Streamly.Internal.Data.Array.Unboxed.Mut.Type as MA

24+import qualified Streamly.Internal.Data.Array.Mut.Type as MA

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

26

27import Test.Hspec as H

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

33type Array = A.Array

34

35moduleName :: String

36−moduleName = "Data.Array.Unboxed"

36+moduleName = "Data.Array"

37

38#include "Streamly/Test/Data/Array/Common.hs"

39

test/Streamly/Test/Data/Array/Unboxed/Mut.hs → test/Streamly/Test/Data/Array/Mut.hsrenamed+3−3

@@ -1,4 +1,4 @@

1−module Streamly.Test.Data.Array.Unboxed.Mut (main) where

1+module Streamly.Test.Data.Array.Mut (main) where

2

3import Test.QuickCheck (listOf)

4

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

23import GHC.RTS.Flags (IoSubSystem(..))

24#endif

25

26−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MArray

26+import qualified Streamly.Internal.Data.Array.Mut as MArray

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

28import qualified Test.Hspec as Hspec

29

@@ -31,7 +31,7 @@ maxTestCount :: Int

31maxTestCount = 100

32

33moduleName :: String

34−moduleName = "Data.Array.Unboxed.Mut"

34+moduleName = "Data.Array.Mut"

35

36testAppend :: Property

37testAppend =

test/Streamly/Test/Data/Array/Stream/Unboxed.hs → test/Streamly/Test/Data/Array/Stream.hsrenamed+3−3

@@ -9,8 +9,8 @@ import Test.Hspec.QuickCheck

9import Test.QuickCheck (forAll, Property, vectorOf, Gen, Arbitrary (arbitrary))

10import Test.QuickCheck.Monadic (monadicIO, run)

11

12−import qualified Streamly.Internal.Data.Array.Unboxed as Array

12+import qualified Streamly.Internal.Data.Array as Array

13−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as ArrayStream

13+import qualified Streamly.Internal.Data.Array.Stream as ArrayStream

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

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

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

@@ -71,7 +71,7 @@ splitOnSuffix sep inp out = do

71-------------------------------------------------------------------------------

72

73moduleName :: String

74−moduleName = "Data.Array.Unboxed.Stream"

74+moduleName = "Data.Array.Stream"

75

76-- Instead of hard coding 10000 here we can have maxStreamLength for operations

77-- that use stream of arrays.

test/Streamly/Test/Data/Fold.hs+1−1

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

23

24import qualified Data.Map

25import qualified Prelude

26−import qualified Streamly.Internal.Data.Array.Unboxed.Mut as MArray

26+import qualified Streamly.Internal.Data.Array.Mut as MArray

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

28import qualified Streamly.Internal.Data.Fold.Extra as Fold

29import qualified Streamly.Internal.Data.Stream as Stream

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

@@ -15,7 +15,7 @@ import Prelude hiding (sequence)

15

16import qualified Data.List as List

17import qualified Prelude

18−import qualified Streamly.Internal.Data.Array.Unboxed as A

18+import qualified Streamly.Internal.Data.Array as A

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

20import qualified Streamly.Internal.Data.Parser as P

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

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

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

13

14import qualified Data.List as List

15import qualified Prelude

16−import qualified Streamly.Internal.Data.Array.Unboxed as A

16+import qualified Streamly.Internal.Data.Array as A

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

18import qualified Streamly.Internal.Data.Parser.ParserD as P

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

test/Streamly/Test/Data/Ring/Unboxed.hs+1−1

@@ -10,7 +10,7 @@ module Streamly.Test.Data.Ring.Unboxed (main) where

10

11import Control.Monad (void)

12

13−import qualified Streamly.Internal.Data.Array.Unboxed.Type as Array

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

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

15

16import Prelude as P

test/Streamly/Test/FileSystem/Event/Common.hs+2−2

@@ -48,7 +48,7 @@ import Data.Function ((&))

48import Data.Functor.Identity (runIdentity)

49import Data.List.NonEmpty (NonEmpty)

50import Data.Word (Word8)

51−import Streamly.Data.Array.Unboxed (Array)

51+import Streamly.Data.Array (Array)

52import System.Directory

53 ( createDirectory

54 , createDirectoryIfMissing

@@ -65,7 +65,7 @@ import System.IO

65import System.IO.Temp (withSystemTempDirectory)

66

67import qualified Data.List.NonEmpty as NonEmpty

68−import qualified Streamly.Internal.Data.Array.Unboxed as Array

68+import qualified Streamly.Internal.Data.Array as Array

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

70import qualified Streamly.Unicode.Stream as Unicode

71

test/Streamly/Test/FileSystem/Handle.hs+1−1

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

29import qualified Streamly.Data.Fold as Fold

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

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

32−import qualified Streamly.Internal.Data.Array.Unboxed as Array

32+import qualified Streamly.Internal.Data.Array as Array

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

34

35import Test.Hspec as H

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

@@ -47,7 +47,7 @@ import qualified Streamly.Prelude as S

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

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

49import qualified Streamly.Internal.Data.Stream.IsStream as IS

50−import qualified Streamly.Data.Array.Unboxed as A

50+import qualified Streamly.Data.Array as A

51

52import Streamly.Internal.Data.Time.Units

53 (AbsTime, NanoSecond64(..), toRelTime64, diffAbsTime64)

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

@@ -18,8 +18,8 @@ import Test.QuickCheck

18 )

19import Test.QuickCheck.Monadic (run, monadicIO, assert)

20

21−import qualified Streamly.Data.Array.Unboxed as A

21+import qualified Streamly.Data.Array as A

22−import qualified Streamly.Internal.Data.Array.Unboxed.Stream as AS

22+import qualified Streamly.Internal.Data.Array.Stream as AS

23import qualified Streamly.Prelude as S

24import qualified Streamly.Unicode.Stream as SS

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

test/streamly-tests.cabal+8−8

@@ -233,17 +233,17 @@ test-suite Data.Array.Generic

233 if flag(use-streamly-core)

234 buildable: False

235

236−test-suite Data.Array.Unboxed

236+test-suite Data.Array

237 import: test-options

238 type: exitcode-stdio-1.0

239− main-is: Streamly/Test/Data/Array/Unboxed.hs

239+ main-is: Streamly/Test/Data/Array.hs

240− ghc-options: -main-is Streamly.Test.Data.Array.Unboxed.main

240+ ghc-options: -main-is Streamly.Test.Data.Array.main

241

242−test-suite Data.Array.Unboxed.Mut

242+test-suite Data.Array.Mut

243 import: test-options

244 type: exitcode-stdio-1.0

245− main-is: Streamly/Test/Data/Array/Unboxed/Mut.hs

245+ main-is: Streamly/Test/Data/Array/Mut.hs

246− ghc-options: -main-is Streamly.Test.Data.Array.Unboxed.Mut.main

246+ ghc-options: -main-is Streamly.Test.Data.Array.Mut.main

247

248test-suite Data.Ring.Unboxed

249 import: test-options

@@ -253,10 +253,10 @@ test-suite Data.Ring.Unboxed

253 if flag(use-streamly-core)

254 buildable: False

255

256−test-suite Data.Array.Unboxed.Stream

256+test-suite Data.Array.Stream

257 import: test-options

258 type: exitcode-stdio-1.0

259− main-is: Streamly/Test/Data/Array/Stream/Unboxed.hs

259+ main-is: Streamly/Test/Data/Array/Stream.hs

260 if flag(use-streamly-core)

261 buildable: False

262