@@ -104,7 +104,6 @@ import Streamly.Internal.System.IO (unsafeInlineIO)
104104import qualified Streamly.Internal.Data.Serialize.Type as Serialize
105105import qualified Streamly.Internal.Data.MutByteArray.Type as MBA
106106import qualified Streamly.Internal.Data.MutArray as MA
107−import qualified Streamly.Internal.Data.Array.Type as A
108107import qualified Streamly.Internal.Data.Fold as FL
109108import qualified Streamly.Internal.Data.Ring as RB
110109import qualified Streamly.Internal.Data.Stream as D
@@ -149,7 +148,7 @@ import Streamly.Internal.Data.Array.Type
149148-- /Pre-release/
150149{-# INLINE null #-}
151150null :: Array a -> Bool
152−null arr = A.byteLength arr == 0
151+null arr = byteLength arr == 0
153152
154153-- | Like 'getIndex' but indexes the array in reverse from the end.
155154--
@@ -185,7 +184,7 @@ writeLastN ::
185184 (Storable a, Unbox a, MonadIO m) => Int -> Fold m a (Array a)
186185writeLastN n
187186 | n <= 0 = fmap (const mempty) FL.drain
188− | otherwise = A.unsafeFreeze <$> Fold step initial done done
187+ | otherwise = unsafeFreeze <$> Fold step initial done done
189188
190189 where
191190
@@ -289,7 +288,7 @@ splitOn :: (Monad m, Unbox a) =>
289288 (a -> Bool) -> Array a -> Stream m (Array a)
290289splitOn predicate arr =
291290 fmap (\(i, len) -> getSliceUnsafe i len arr)
292− $ D.indexOnSuffix predicate (A.read arr)
291+ $ D.indexOnSuffix predicate (read arr)
293292
294293{-# INLINE sliceIndexerFromLen #-}
295294sliceIndexerFromLen :: forall m a. (Monad m, Unbox a)
@@ -297,7 +296,7 @@ sliceIndexerFromLen :: forall m a. (Monad m, Unbox a)
297296 -> Int -- ^ length of the slice
298297 -> Unfold m (Array a) (Int, Int)
299298sliceIndexerFromLen from len =
300− Unfold.lmap A.unsafeThaw (MA.sliceIndexerFromLen from len)
299+ Unfold.lmap unsafeThaw (MA.sliceIndexerFromLen from len)
301300
302301{-# DEPRECATED genSlicesFromLen "Please use sliceIndexerFromLen instead." #-}
303302genSlicesFromLen :: forall m a. (Monad m, Unbox a)
@@ -317,8 +316,8 @@ slicerFromLen :: forall m a. (Monad m, Unbox a)
317316 -> Int -- ^ length of the slice
318317 -> Unfold m (Array a) (Array a)
319318slicerFromLen from len =
320− fmap A.unsafeFreeze
321− $ Unfold.lmap A.unsafeThaw (MA.slicerFromLen from len)
319+ fmap unsafeFreeze
320+ $ Unfold.lmap unsafeThaw (MA.slicerFromLen from len)
322321
323322{-# DEPRECATED getSlicesFromLen "Please use slicerFromLen instead." #-}
324323getSlicesFromLen :: forall m a. (Monad m, Unbox a)
@@ -367,7 +366,7 @@ getIndex i arr =
367366indexReader :: (Monad m, Unbox a) => Stream m Int -> Unfold m (Array a) a
368367indexReader m =
369368 let unf = MA.indexReaderWith (return . unsafeInlineIO) m
370− in Unfold.lmap A.unsafeThaw unf
369+ in Unfold.lmap unsafeThaw unf
371370
372371-- XXX DO NOT REMOVE, change the signature to use Stream instead of unfold
373372{-# DEPRECATED getIndices "Please use getIndices instead." #-}
@@ -407,7 +406,7 @@ indexReaderFromThenTo = undefined
407406{-# INLINE runPipe #-}
408407runPipe :: (MonadIO m, Unbox a, Unbox b)
409408 => Pipe m a b -> Array a -> m (Array b)
410−runPipe f arr = P.runPipe (toArrayMinChunk (length arr)) $ f (A.read arr)
409+runPipe f arr = P.runPipe (toArrayMinChunk (length arr)) $ f (read arr)
411410-}
412411
413412-- XXX For transformations that cannot change the number of elements e.g. "map"
@@ -421,7 +420,7 @@ runPipe f arr = P.runPipe (toArrayMinChunk (length arr)) $ f (A.read arr)
421420streamTransform :: forall m a b. (MonadIO m, Unbox a, Unbox b)
422421 => (Stream m a -> Stream m b) -> Array a -> m (Array b)
423422streamTransform f arr =
424− Stream.fold (A.writeWith (length arr)) $ f (A.read arr)
423+ Stream.fold (writeWith (length arr)) $ f (read arr)
425424
426425-------------------------------------------------------------------------------
427426-- Casts
@@ -455,7 +454,7 @@ asBytes = castUnsafe
455454--
456455cast :: forall a b. (Unbox b) => Array a -> Maybe (Array b)
457456cast arr =
458− let len = A.byteLength arr
457+ let len = byteLength arr
459458 r = len `mod` SIZE_OF(b)
460459 in if r /= 0
461460 then Nothing
@@ -473,7 +472,7 @@ cast arr =
473472--
474473asCStringUnsafe :: Array a -> (CString -> IO b) -> IO b
475474asCStringUnsafe arr act = do
476− let arr1 = asBytes arr <> A.fromList [0]
475+ let arr1 = asBytes arr <> fromList [0]
477476 -- asPtrUnsafe makes sure the array is pinned
478477 asPtrUnsafe arr1 $ \ptr -> act (castPtr ptr)
479478
@@ -488,14 +487,14 @@ asCStringUnsafe arr act = do
488487-- /Pre-release/
489488{-# INLINE fold #-}
490489fold :: forall m a b. (Monad m, Unbox a) => Fold m a b -> Array a -> m b
491−fold f arr = Stream.fold f (A.read arr)
490+fold f arr = Stream.fold f (read arr)
492491
493492-- | Fold an array using a stream fold operation.
494493--
495494-- /Pre-release/
496495{-# INLINE streamFold #-}
497496streamFold :: (Monad m, Unbox a) => (Stream m a -> m b) -> Array a -> m b
498−streamFold f arr = f (A.read arr)
497+streamFold f arr = f (read arr)
499498
500499--------------------------------------------------------------------------------
501500-- Serialization