5d5d16a · streamly · git.iko.soy

git.iko.soy/streamly

Merge pull request #240 from composewell/misc-refactorings

Refactor modules Mem.* -> Memory.* and update references.

commit5d5d16ab2bda217be9394c6f388c548beb284a37 authorHarendra Kumar <harendra.kumar@gmail.com> dateTue 6 Aug 2019, 05:55 (7 years ago) parent2438be4 bda6a64

28 files changed+77−77

compare with master

unifiedsplit

Changelog.md+2−2 README.md+3−3 benchmark/Array.hs+1−1 benchmark/ArrayOps.hs+1−1 benchmark/FileIO.hs+2−2 benchmark/Linear.hs+1−1 benchmark/NanoBenchmarks.hs+1−1 design/inlining.md+1−1 examples/FileIOExamples.hs+1−1 examples/FileSinkServer.hs+1−1 examples/HandleIO.hs+2−2 src/Streamly.hs+2−2 src/Streamly/FileSystem/FD.hs+6−6 src/Streamly/FileSystem/File.hs+3−3 src/Streamly/FileSystem/Handle.hs+5−5 src/Streamly/Mem/Array.hs → src/Streamly/Memory/Array.hs+5−5 src/Streamly/Mem/Array/Types.hs → src/Streamly/Memory/Array/Types.hs+6−6 src/Streamly/Mem/ArrayStream.hs → src/Streamly/Memory/ArrayStream.hs+4−4 src/Streamly/Mem/Ring.hs → src/Streamly/Memory/Ring.hs+3−3 src/Streamly/Network/Client.hs+2−2 src/Streamly/Network/Socket.hs+5−5 src/Streamly/Pipe.hs+3−3 src/Streamly/Prelude.hs+2−2 src/Streamly/Streams/StreamD.hs+3−3 src/Streamly/String.hs+4−4 streamly.cabal+4−4 test/Arrays.hs+2−2 test/String.hs+2−2

Changelog.md+2−2

@@ -81,9 +81,9 @@ example, concat streams concurrently using this.

8181* Add the following new features/modules:

8282 * _Unicode Strings_: `Streamly.String` module provides encoding/decoding of

8383 character streams and other character stream operations.

84− * _Arrays_: `Streamly.Mem.Array` module provides arrays for efficient

84+ * _Arrays_: `Streamly.Memory.Array` module provides arrays for efficient

8585 in-memory buffering and efficient interfacing with IO.

86− * `Streamly.Mem.Array.Stream` module provide combinators to work on streams

86+ * `Streamly.Memory.Array.Stream` module provide combinators to work on streams

8787 of arrays.

8888

8989* Add the following to `Streamly.Prelude`:

README.md+3−3

@@ -361,7 +361,7 @@ documentation.

361361

362362## Arrays

363363

364−The `Streamly.Mem.Array` module provides mutable arrays. Arrays are the

364+The `Streamly.Memory.Array` module provides mutable arrays. Arrays are the

365365computing duals of streams. Streams are good at sequential access, immutable

366366transformations of in-transit data whereas arrays are good at random access,

367367in-place transformations of buffered data. Unlike streams which are potentially

@@ -407,8 +407,8 @@ module Main where

407407

408408import qualified Streamly.Prelude as S

409409import qualified Streamly.Fold as FL

410−import qualified Streamly.Mem.Array as A

411−import qualified Streamly.Mem.ArrayStream as AS

410+import qualified Streamly.Memory.Array as A

411+import qualified Streamly.Memory.ArrayStream as AS

412412import qualified Streamly.FileSystem.Handle as FH

413413import qualified System.IO as FH

414414

benchmark/Array.hs+1−1

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

1313import qualified GHC.Exts as GHC

1414

1515import qualified ArrayOps as Ops

16−import qualified Streamly.Mem.Array as A

16+import qualified Streamly.Memory.Array as A

1717import qualified Streamly.Prelude as S

1818

1919import Gauge

benchmark/ArrayOps.hs+1−1

@@ -26,7 +26,7 @@ import qualified GHC.Exts as GHC

2626-- import GHC.Generics (Generic)

2727

2828import qualified Streamly as S hiding (foldMapWith, runStream)

29−import qualified Streamly.Mem.Array as A

29+import qualified Streamly.Memory.Array as A

3030import qualified Streamly.Prelude as S

3131

3232value, maxValue :: Int

benchmark/FileIO.hs+2−2

@@ -16,8 +16,8 @@ import Data.IORef

1616import Gauge

1717

1818import qualified Streamly.FileSystem.Handle as FH

19−import qualified Streamly.Mem.Array as A

20−import qualified Streamly.Mem.ArrayStream as AS

19+import qualified Streamly.Memory.Array as A

20+import qualified Streamly.Memory.ArrayStream as AS

2121import qualified Streamly.Prelude as S

2222import qualified Streamly.Fold as FL

2323import qualified Streamly.String as SS

benchmark/Linear.hs+1−1

@@ -21,7 +21,7 @@ import qualified LinearOps as Ops

2121import Streamly

2222import qualified Streamly.Fold as FL

2323--import qualified Streamly.Pipe as Pipe

24−import qualified Streamly.Mem.Array as A

24+import qualified Streamly.Memory.Array as A

2525import qualified Streamly.Prelude as S

2626-- import qualified Streamly.Sink as Sink

2727import Gauge

benchmark/NanoBenchmarks.hs+1−1

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

99import Streamly (SerialT)

1010import Streamly.SVar (MonadAsync)

1111

12−import qualified Streamly.Mem.Array as A

12+import qualified Streamly.Memory.Array as A

1313import qualified Streamly.FileSystem.Handle as FH

1414import qualified Streamly.Fold as FL

1515import qualified Streamly.Prelude as S

design/inlining.md+1−1

@@ -62,7 +62,7 @@ concatMap1 src = runStream $ S.concatMap (S.replicate 3) src

6262 as `INLINE` or `INLINE_EARLY`, instead they should all be marked as

6363 `INLINE_NORMAL` because higher order funcitons like `concatMap`/`map`/`mapM`

6464 etc are marked as `INLINE_NORMAL`. `StreamD` functions in other modules like

65− `Streamly.Mem.Array` should also follow the same rules.

65+ `Streamly.Memory.Array` should also follow the same rules.

6666

6767* The inlining of the `step` function (in case of `StreamD`) is annotated as

6868 `INLINE_LATE` so that those are inlined after fusion rules have been applied.

examples/FileIOExamples.hs+1−1

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

11import qualified Streamly.Prelude as S

22import qualified Streamly.Fold as FL

3−import qualified Streamly.Mem.Array as A

3+import qualified Streamly.Memory.Array as A

44import qualified Streamly.FileSystem.File as File

66import Data.Char (ord)

examples/FileSinkServer.hs+1−1

@@ -10,7 +10,7 @@ import System.Environment (getArgs)

1010import Streamly

1111import Streamly.String

1212import qualified Streamly.FileSystem.Handle as FH

13−import qualified Streamly.Mem.Array as A

13+import qualified Streamly.Memory.Array as A

1414import qualified Streamly.Network.Socket as NS

1515import qualified Streamly.Network.Server as NS

1616import qualified Streamly.Prelude as S

examples/HandleIO.hs+2−2

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

11import qualified Streamly.Prelude as S

22import qualified Streamly.Fold as FL

3−-- import qualified Streamly.Mem.Array as A

4−import qualified Streamly.Mem.ArrayStream as AS

3+-- import qualified Streamly.Memory.Array as A

4+import qualified Streamly.Memory.ArrayStream as AS

55import qualified Streamly.FileSystem.Handle as FH

66import qualified System.IO as FH

77-- import qualified Streamly.FileSystem.FD as FH

src/Streamly.hs+2−2

@@ -216,7 +216,7 @@ import qualified Streamly.Streams.StreamK as K

216216-- > S.length $ S.splitOnSuffix FL.drain 10 $ FH.read fh

217217--

218218-- The following example folds the lines to arrays of 'Word8' using the

219−-- 'Streamly.Mem.Array.writeF' fold and then wraps the lines in square

219+-- 'Streamly.Memory.Array.writeF' fold and then wraps the lines in square

220220-- brackets before writing them to standard output using

221221-- 'Streamly.FileSystem.Handle.write':

222222--

@@ -267,7 +267,7 @@ import qualified Streamly.Streams.StreamK as K

267267

268268-- $arrays

269269--

270−-- Streamly arrays (See "Streamly.Mem.Array") complement streams to provide an

270+-- Streamly arrays (See "Streamly.Memory.Array") complement streams to provide an

271271-- efficient computing paradigm. Streams are suitable for immutable

272272-- transformations of /potentially infinite/ data using /sequential access/ and

273273-- pipelined transformations whereas arrays are suitable for in-place

src/Streamly/FileSystem/FD.hs+6−6

@@ -31,7 +31,7 @@

3131--

3232-- Reading and writing APIs are divided into two categories, sequential

3333-- streaming APIs and random or seekable access APIs. File IO APIs are quite

34−-- similar to "Streamly.Mem.Array" read write APIs. In that regard, arrays can

34+-- similar to "Streamly.Memory.Array" read write APIs. In that regard, arrays can

3535-- be considered as in-memory files or files can be considered as on-disk

3636-- arrays.

3737--

@@ -136,13 +136,13 @@ import Prelude hiding (read)

136136import qualified GHC.IO.FD as FD

137137import qualified GHC.IO.Device as RawIO

138138

139−import Streamly.Mem.Array.Types (Array(..))

139+import Streamly.Memory.Array.Types (Array(..))

140140import Streamly.Streams.Serial (SerialT)

141141import Streamly.Streams.StreamK.Type (IsStream, mkStream)

142−import Streamly.Mem.Array.Types (byteLength, defaultChunkSize)

142+import Streamly.Memory.Array.Types (byteLength, defaultChunkSize)

143143

144144#if !defined(mingw32_HOST_OS)

145−import Streamly.Mem.Array.Types (groupIOVecsOf)

145+import Streamly.Memory.Array.Types (groupIOVecsOf)

146146import Streamly.Streams.StreamD (toStreamD)

147147import Streamly.Streams.StreamD.Type (fromStreamD)

148148import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

@@ -150,8 +150,8 @@ import qualified Streamly.FileSystem.FDIO as RawIO hiding (write)

150150-- import Streamly.Fold (Fold)

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

152152

153−import qualified Streamly.Mem.Array as A

154−import qualified Streamly.Mem.ArrayStream as AS

153+import qualified Streamly.Memory.Array as A

154+import qualified Streamly.Memory.ArrayStream as AS

155155import qualified Streamly.Prelude as S

156156import qualified Streamly.Streams.StreamD.Type as D

157157

src/Streamly/FileSystem/File.hs+3−3

@@ -115,7 +115,7 @@ import Prelude hiding (read)

115115

116116import qualified System.IO as SIO

117117

118−import Streamly.Mem.Array.Types (Array(..))

118+import Streamly.Memory.Array.Types (Array(..))

119119import Streamly.Streams.Serial (SerialT)

120120import Streamly.Streams.StreamK.Type (IsStream)

121121import Streamly.SVar (MonadAsync)

@@ -123,8 +123,8 @@ import Streamly.SVar (MonadAsync)

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

124124

125125import qualified Streamly.FileSystem.Handle as FH

126−import qualified Streamly.Mem.ArrayStream as AS

127−import qualified Streamly.Mem.Array.Types as A hiding (flattenArrays)

126+import qualified Streamly.Memory.ArrayStream as AS

127+import qualified Streamly.Memory.Array.Types as A hiding (flattenArrays)

128128import qualified Streamly.Prelude as S

129129

130130-------------------------------------------------------------------------------

src/Streamly/FileSystem/Handle.hs+5−5

@@ -16,7 +16,7 @@

1616-- Portability : GHC

1717--

1818-- Read and write streams and arrays to and from file handles. File handle IO

19−-- APIs are quite similar to "Streamly.Mem.Array" read write APIs. In that

19+-- APIs are quite similar to "Streamly.Memory.Array" read write APIs. In that

2020-- regard, arrays can be considered as in-memory files or files can be

2121-- considered as on-disk arrays.

2222--

@@ -119,15 +119,15 @@ import GHC.ForeignPtr (mallocPlainForeignPtrBytes)

119119import System.IO (Handle, hGetBufSome, hPutBuf)

120120import Prelude hiding (read)

121121

122−import Streamly.Mem.Array.Types (Array(..))

122+import Streamly.Memory.Array.Types (Array(..))

123123import Streamly.Streams.Serial (SerialT)

124124import Streamly.Streams.StreamK.Type (IsStream, mkStream)

125−import Streamly.Mem.Array.Types (defaultChunkSize, shrinkToFit)

125+import Streamly.Memory.Array.Types (defaultChunkSize, shrinkToFit)

126126-- import Streamly.Fold (Fold)

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

128128

129−import qualified Streamly.Mem.Array as A

130−import qualified Streamly.Mem.ArrayStream as AS

129+import qualified Streamly.Memory.Array as A

130+import qualified Streamly.Memory.ArrayStream as AS

131131import qualified Streamly.Prelude as S

132132import qualified Streamly.Streams.StreamD.Type as D

133133

src/Streamly/Mem/Array.hs → src/Streamly/Memory/Array.hsrenamed+5−5

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

88#include "inline.hs"

1010-- |

11−-- Module : Streamly.Mem.Array

11+-- Module : Streamly.Memory.Array

1313--

1414-- License : BSD3

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

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

4949-- instances are deliberately not provided to avoid misuse; concatenating

5050-- arrays using binary operations can be highly inefficient. Instead, use

51−-- 'Streamly.Mem.Array.Stream.toArray' to concatenate N arrays at once.

51+-- 'Streamly.Memory.Array.Stream.toArray' to concatenate N arrays at once.

5252--

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

5454-- single byte) are only as good as holding those elements in a Haskell list.

@@ -59,7 +59,7 @@

5959-- arbitrarily large amounts of memory but still using small chunks of

6060-- contiguous memory.

6161

62−module Streamly.Mem.Array

62+module Streamly.Memory.Array

6363 (

6464 Array

6565

@@ -130,12 +130,12 @@ import Foreign.Ptr (minusPtr, plusPtr)

130130import Foreign.Storable (Storable(..))

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

132132

133−import Streamly.Mem.Array.Types (Array(..), length)

133+import Streamly.Memory.Array.Types (Array(..), length)

134134import Streamly.Streams.Serial (SerialT)

135135import Streamly.Streams.StreamK.Type (IsStream)

136136import Streamly.Fold.Types (Fold(..))

137137

138−import qualified Streamly.Mem.Array.Types as A

138+import qualified Streamly.Memory.Array.Types as A

139139import qualified Streamly.Streams.Prelude as P

140140import qualified Streamly.Streams.Serial as Serial

141141import qualified Streamly.Streams.StreamD as D

src/Streamly/Mem/Array/Types.hs → src/Streamly/Memory/Array/Types.hsrenamed+6−6

@@ -10,7 +10,7 @@

1010#include "inline.hs"

1111

1212-- |

13−-- Module : Streamly.Mem.Array.Types

13+-- Module : Streamly.Memory.Array.Types

1515--

1616-- License : BSD3

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

1818-- Stability : experimental

1919-- Portability : GHC

2020--

21−module Streamly.Mem.Array.Types

21+module Streamly.Memory.Array.Types

2222 (

2323 Array (..)

2424

@@ -526,7 +526,7 @@ fromStreamDArraysOf n (D.Stream step state) =

526526 step' _ (GroupStart st) = do

527527 when (n <= 0) $

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

529− error $ "Streamly.Mem.Array.Types.fromStreamDArraysOf: the size of "

529+ error $ "Streamly.Memory.Array.Types.fromStreamDArraysOf: the size of "

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

531531 Array start end bound <- liftIO $ newArray n

532532 return $ D.Skip (GroupBuffer st start end bound)

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

902902 step' gst (SpliceInitial st) = do

903903 when (n <= 0) $

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

905− error $ "Streamly.Mem.Array.Types.packArraysChunksOf: the size of "

905+ error $ "Streamly.Memory.Array.Types.packArraysChunksOf: the size of "

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

907907 r <- step gst st

908908 case r of

@@ -959,11 +959,11 @@ groupIOVecsOf n maxIOVLen (D.Stream step state) =

959959 step' gst (GatherInitial st) = do

960960 when (n <= 0) $

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

962− error $ "Streamly.Mem.Array.Types.groupIOVecsOf: the size of "

962+ error $ "Streamly.Memory.Array.Types.groupIOVecsOf: the size of "

963963 ++ "groups [" ++ show n ++ "] must be a natural number"

964964 when (maxIOVLen <= 0) $

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

966− error $ "Streamly.Mem.Array.Types.groupIOVecsOf: the number of "

966+ error $ "Streamly.Memory.Array.Types.groupIOVecsOf: the number of "

967967 ++ "IOVec entries [" ++ show n ++ "] must be a natural number"

968968 r <- step (adaptState gst) st

969969 case r of

src/Streamly/Mem/ArrayStream.hs → src/Streamly/Memory/ArrayStream.hsrenamed+4−4

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

88#include "inline.hs"

1010-- |

11−-- Module : Streamly.Mem.ArrayStream

11+-- Module : Streamly.Memory.ArrayStream

1313--

1414-- License : BSD3

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

1818--

1919-- Combinators to efficiently manipulate streams of arrays.

2020--

21−module Streamly.Mem.ArrayStream

21+module Streamly.Memory.ArrayStream

2222 (

2323 -- * Creation

2424 arraysOf

@@ -45,11 +45,11 @@ import Foreign.Ptr (minusPtr, plusPtr, castPtr)

4545import Foreign.Storable (Storable(..))

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

4747

48−import Streamly.Mem.Array.Types (Array(..), length)

48+import Streamly.Memory.Array.Types (Array(..), length)

4949import Streamly.Streams.Serial (SerialT)

5050import Streamly.Streams.StreamK.Type (IsStream)

5151

52−import qualified Streamly.Mem.Array.Types as A

52+import qualified Streamly.Memory.Array.Types as A

5353import qualified Streamly.Prelude as S

5454import qualified Streamly.Streams.StreamD as D

5555import qualified Streamly.Streams.Prelude as P

src/Streamly/Mem/Ring.hs → src/Streamly/Memory/Ring.hsrenamed+3−3

@@ -4,7 +4,7 @@

44{-# LANGUAGE ExistentialQuantification #-}

66-- |

7−-- Module : Streamly.Mem.Ring

7+-- Module : Streamly.Memory.Ring

99-- License : BSD3

1010-- Maintainer : harendra.kumar@gmail.com

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

1212-- Portability : GHC

1313--

1414

15−module Streamly.Mem.Ring

15+module Streamly.Memory.Ring

1616 ( Ring(..)

1717

1818 -- * Construction

@@ -40,7 +40,7 @@ import GHC.ForeignPtr (mallocPlainForeignPtrAlignedBytes)

4040import GHC.Ptr (Ptr(..))

4141import Prelude hiding (length, concat)

4242

43−import qualified Streamly.Mem.Array.Types as A

43+import qualified Streamly.Memory.Array.Types as A

4444

4545-- | A ring buffer is a mutable array of fixed size. Initially the array is

4646-- empty, with ringStart pointing at the start of allocated memory. We call the

src/Streamly/Network/Client.hs+2−2

@@ -66,11 +66,11 @@ import Prelude hiding (read)

6666import qualified Network.Socket as Net

6767

6868import Streamly (MonadAsync)

69−import Streamly.Mem.Array.Types (Array(..), defaultChunkSize)

69+import Streamly.Memory.Array.Types (Array(..), defaultChunkSize)

7070import Streamly.Streams.Serial (SerialT)

7171import Streamly.Streams.StreamK.Type (IsStream)

7272

73−import qualified Streamly.Mem.ArrayStream as AS

73+import qualified Streamly.Memory.ArrayStream as AS

7474import qualified Streamly.Prelude as S

7575import qualified Streamly.Network.Socket as SK

7676

src/Streamly/Network/Socket.hs+5−5

@@ -17,7 +17,7 @@

1717-- Portability : GHC

1818--

1919-- Read and write streams and arrays to and from network sockets. Socket IO

20−-- APIs are quite similar to "Streamly.Mem.Array" read write APIs and almost

20+-- APIs are quite similar to "Streamly.Memory.Array" read write APIs and almost

2121-- identical to the sequential streaming APIs in "Streamly.FileSystem.File".

2222--

2323-- Read IO requests to the socket are performed in chunks of 32KiB, this is

@@ -86,15 +86,15 @@ import Prelude hiding (read)

8686

8787import qualified Network.Socket as Net

8888

89−import Streamly.Mem.Array.Types (Array(..))

89+import Streamly.Memory.Array.Types (Array(..))

9090import Streamly.Streams.Serial (SerialT)

9191import Streamly.Streams.StreamK.Type (IsStream, mkStream)

9292-- import Streamly.Fold (Fold)

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

9494

95−import qualified Streamly.Mem.Array as A

96−import qualified Streamly.Mem.ArrayStream as AS

97−import qualified Streamly.Mem.Array.Types as A hiding (flattenArrays)

95+import qualified Streamly.Memory.Array as A

96+import qualified Streamly.Memory.ArrayStream as AS

97+import qualified Streamly.Memory.Array.Types as A hiding (flattenArrays)

9898import qualified Streamly.Prelude as S

9999

100100-- | @'withSocket' socket act@ runs the monadic computation @act@ passing the

src/Streamly/Pipe.hs+3−3

@@ -254,8 +254,8 @@ import Prelude

254254-- import Streamly.Fold.Types (Fold(..))

255255import Streamly.Pipe.Types

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

257−-- import Streamly.Mem.Array.Types (Array)

258−-- import Streamly.Mem.Ring (Ring)

257+-- import Streamly.Memory.Array.Types (Array)

258+-- import Streamly.Memory.Ring (Ring)

259259-- import Streamly.Streams.Serial (SerialT)

260260-- import Streamly.Streams.StreamK (IsStream())

261261-- import Streamly.Time.Units

@@ -264,7 +264,7 @@ import Streamly.Pipe.Types

264264

265265-- import Streamly.Strict

266266

267−-- import qualified Streamly.Mem.Array.Types as A

267+-- import qualified Streamly.Memory.Array.Types as A

268268-- import qualified Streamly.Prelude as S

269269-- import qualified Streamly.Streams.StreamD as D

270270-- import qualified Streamly.Streams.StreamK as K

src/Streamly/Prelude.hs+2−2

@@ -640,7 +640,7 @@ import qualified System.IO as IO

640640

641641import Streamly.Enumeration (Enumerable(..), enumerate, enumerateTo)

642642import Streamly.Fold.Types (Fold (..))

643−import Streamly.Mem.Array (Array)

643+import Streamly.Memory.Array (Array)

644644import Streamly.SVar (MonadAsync, defState)

645645import Streamly.Streams.Async (mkAsync')

646646import Streamly.Streams.Combinators (maxYields)

@@ -656,7 +656,7 @@ import Streamly.Time.Units

656656

657657import Streamly.Strict

658658

659−import qualified Streamly.Mem.Array as A

659+import qualified Streamly.Memory.Array as A

660660import qualified Streamly.Fold as FL

661661import qualified Streamly.Streams.Prelude as P

662662import qualified Streamly.Streams.StreamK as K

src/Streamly/Streams/StreamD.hs+3−3

@@ -280,7 +280,7 @@ import Prelude

280280

281281import qualified Control.Monad.Catch as MC

282282

283−import Streamly.Mem.Array.Types (Array(..))

283+import Streamly.Memory.Array.Types (Array(..))

284284import Streamly.Fold.Types (Fold(..))

285285import Streamly.Pipe.Types (Pipe(..), PipeState(..))

286286import Streamly.SVar (MonadAsync, defState, adaptState)

@@ -288,8 +288,8 @@ import Streamly.SVar (MonadAsync, defState, adaptState)

288288import Streamly.Streams.StreamD.Type

289289

290290import qualified Streamly.Pipe.Types as Pipe

291−import qualified Streamly.Mem.Array.Types as A

292−import qualified Streamly.Mem.Ring as RB

291+import qualified Streamly.Memory.Array.Types as A

292+import qualified Streamly.Memory.Ring as RB

293293import qualified Streamly.Streams.StreamK as K

294294

295295------------------------------------------------------------------------------

src/Streamly/String.hs+4−4

@@ -70,12 +70,12 @@ import GHC.Base (unsafeChr)

7070import Streamly (IsStream, MonadAsync)

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

7272import Streamly.Fold (Fold)

73−import Streamly.Mem.Array (Array)

73+import Streamly.Memory.Array (Array)

7474

7575import qualified Streamly.Prelude as S

76−import qualified Streamly.Mem.Array.Types as A (unlines)

77−import qualified Streamly.Mem.Array as A

78−import qualified Streamly.Mem.ArrayStream as AS

76+import qualified Streamly.Memory.Array.Types as A (unlines)

77+import qualified Streamly.Memory.Array as A

78+import qualified Streamly.Memory.ArrayStream as AS

7979import qualified Streamly.Streams.StreamD as D

8080

8181-- type String = List Char

streamly.cabal+4−4

@@ -185,8 +185,8 @@ library

185185 , Streamly.Enumeration

186186

187187 -- Memory storage

188− , Streamly.Mem.Array.Types

189− , Streamly.Mem.Ring

188+ , Streamly.Memory.Array.Types

189+ , Streamly.Memory.Ring

190190

191191 -- Base streams

192192 , Streamly.Streams.StreamK.Type

@@ -231,8 +231,8 @@ library

231231 , Streamly.String

232232

233233 -- IO devices

234− , Streamly.Mem.Array

235− , Streamly.Mem.ArrayStream

234+ , Streamly.Memory.Array

235+ , Streamly.Memory.ArrayStream

236236 , Streamly.FileSystem.Handle

237237

238238 , Streamly.Tutorial

test/Arrays.hs+2−2

@@ -11,8 +11,8 @@ import Test.QuickCheck.Monadic (monadicIO, assert)

1111

1212import Test.Hspec as H

1313

14−import qualified Streamly.Mem.Array as A

15−import qualified Streamly.Mem.ArrayStream as AS

14+import qualified Streamly.Memory.Array as A

15+import qualified Streamly.Memory.ArrayStream as AS

1616import qualified Streamly.Prelude as S

1717

1818-- Coverage build takes too long with default number of tests

test/String.hs+2−2

@@ -12,8 +12,8 @@ import Test.QuickCheck.Monadic (run, monadicIO, assert)

1212

1313import Test.Hspec as H

1414

15−import qualified Streamly.Mem.Array as A

16−import qualified Streamly.Mem.ArrayStream as AS

15+import qualified Streamly.Memory.Array as A

16+import qualified Streamly.Memory.ArrayStream as AS

1717import qualified Streamly.Prelude as S

1818import qualified Streamly.String as SS

1919