From e718389b2c75044f0fdafb9377e825aecbbd0246 Mon Sep 17 00:00:00 2001
From: Harendra Kumar <harendra@composewell.com>
Date: Wed, 21 Sep 2022 23:05:31 +0530
Subject: [PATCH] Move the Parallel module under IsStream

---
 benchmark/Streamly/Benchmark/Data/Stream/Transform.hs       | 2 +-
 src/Streamly/Internal/Data/Stream/IsStream/Common.hs        | 2 +-
 src/Streamly/Internal/Data/Stream/IsStream/Expand.hs        | 2 +-
 src/Streamly/Internal/Data/Stream/IsStream/Generate.hs      | 2 +-
 .../Internal/Data/Stream/{ => IsStream}/Parallel.hs         | 6 +++---
 src/Streamly/Internal/Data/Stream/IsStream/Transform.hs     | 2 +-
 src/Streamly/Internal/Data/Stream/IsStream/Type.hs          | 5 +++--
 streamly.cabal                                              | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)
 rename src/Streamly/Internal/Data/Stream/{ => IsStream}/Parallel.hs (99%)

diff --git a/benchmark/Streamly/Benchmark/Data/Stream/Transform.hs b/benchmark/Streamly/Benchmark/Data/Stream/Transform.hs
index 209f5e168..3f540ed7f 100644
--- a/benchmark/Streamly/Benchmark/Data/Stream/Transform.hs
+++ b/benchmark/Streamly/Benchmark/Data/Stream/Transform.hs
@@ -35,7 +35,7 @@ import qualified Streamly.Internal.Data.Unfold as Unfold
 import qualified Streamly.Internal.Data.Stream.IsStream as Stream
 import Streamly.Internal.Data.Time.Units
 #else
-import qualified Streamly.Internal.Data.Stream.Parallel as Stream
+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Stream
 import qualified Streamly.Internal.Data.Stream as Stream
 #endif
 
diff --git a/src/Streamly/Internal/Data/Stream/IsStream/Common.hs b/src/Streamly/Internal/Data/Stream/IsStream/Common.hs
index 60e794f63..72fcc75aa 100644
--- a/src/Streamly/Internal/Data/Stream/IsStream/Common.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream/Common.hs
@@ -84,7 +84,7 @@ import qualified Streamly.Data.Stream as Stream (fold, foldBreak)
 import qualified Streamly.Internal.Data.Array.Unboxed.Type as A
 import qualified Streamly.Internal.Data.Stream.IsStream.Async as Async
 import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
-import qualified Streamly.Internal.Data.Stream.Parallel as Par
+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par
 import qualified Streamly.Internal.Data.Stream.StreamK.Type as K
     (fromPure, fromEffect, repeatMWith, reverse)
 import qualified Streamly.Internal.Data.Stream.StreamD as D
diff --git a/src/Streamly/Internal/Data/Stream/IsStream/Expand.hs b/src/Streamly/Internal/Data/Stream/IsStream/Expand.hs
index 6807b7954..2af8d1a9e 100644
--- a/src/Streamly/Internal/Data/Stream/IsStream/Expand.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream/Expand.hs
@@ -174,7 +174,7 @@ import Streamly.Internal.Data.Stream.IsStream.Type
 import Streamly.Data.Unfold (Unfold)
 
 import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
-import qualified Streamly.Internal.Data.Stream.Parallel as Par
+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par
 import qualified Streamly.Internal.Data.Stream.WSerial as WSerial
 import qualified Streamly.Internal.Data.Stream.StreamD as D
     (append, interleave, interleaveSuffix, interleaveInfix, interleaveMin
diff --git a/src/Streamly/Internal/Data/Stream/IsStream/Generate.hs b/src/Streamly/Internal/Data/Stream/IsStream/Generate.hs
index eed6f90d4..12f5895da 100644
--- a/src/Streamly/Internal/Data/Stream/IsStream/Generate.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream/Generate.hs
@@ -109,7 +109,7 @@ import Streamly.Internal.Data.Unboxed (Unboxed)
 import qualified Streamly.Internal.Data.IORef.Unboxed as Unboxed
     (toStreamD, IORef)
 import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
-import qualified Streamly.Internal.Data.Stream.Parallel as Par
+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par
 import qualified Streamly.Internal.Data.Stream.Serial as Serial
 import qualified Streamly.Internal.Data.Stream.StreamD as D
     (unfold, unfoldr, toStreamK, unfoldr, repeat, replicate, replicateM
diff --git a/src/Streamly/Internal/Data/Stream/Parallel.hs b/src/Streamly/Internal/Data/Stream/IsStream/Parallel.hs
similarity index 99%
rename from src/Streamly/Internal/Data/Stream/Parallel.hs
rename to src/Streamly/Internal/Data/Stream/IsStream/Parallel.hs
index ed98e84c7..fbac341bc 100644
--- a/src/Streamly/Internal/Data/Stream/Parallel.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream/Parallel.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 
 -- |
--- Module      : Streamly.Internal.Data.Stream.Parallel
+-- Module      : Streamly.Internal.Data.Stream.IsStream.Parallel
 -- Copyright   : (c) 2017 Composewell Technologies
 --
 -- License     : BSD3
@@ -20,7 +20,7 @@
 --      return n                    -- IO Int
 -- :}
 --
-module Streamly.Internal.Data.Stream.Parallel
+module Streamly.Internal.Data.Stream.IsStream.Parallel
     (
     -- * Parallel Stream Type
       ParallelT(..)
@@ -545,7 +545,7 @@ parallelFst m1 m2 =
 -- seconds.
 --
 -- >>> import qualified Streamly.Data.Fold as Fold
--- >>> import qualified Streamly.Internal.Data.Stream.Parallel as Parallel
+-- >>> import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Parallel
 -- >>> Stream.fold Fold.drain $ Parallel.interjectSuffix 1.05 (putChar ',') $ Stream.mapM (\x -> threadDelay 1000000 >> putChar x) $ Stream.fromList "hello"
 -- h,e,l,l,o
 --
diff --git a/src/Streamly/Internal/Data/Stream/IsStream/Transform.hs b/src/Streamly/Internal/Data/Stream/IsStream/Transform.hs
index 04d1fa6fe..34b3bfea5 100644
--- a/src/Streamly/Internal/Data/Stream/IsStream/Transform.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream/Transform.hs
@@ -251,7 +251,7 @@ import Streamly.Internal.Data.SVar (Rate(..))
 import Streamly.Internal.Data.Time.Units (AbsTime, RelTime64)
 
 import qualified Streamly.Data.Fold as FL
-import qualified Streamly.Internal.Data.Stream.Parallel as Par
+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Par
 import qualified Streamly.Internal.Data.Stream.Serial as Serial
 import qualified Streamly.Internal.Data.Stream.StreamD as D
     (transform, foldrT, tap, tapOffsetEvery, pollCounts, mapM, scanOnce
diff --git a/src/Streamly/Internal/Data/Stream/IsStream/Type.hs b/src/Streamly/Internal/Data/Stream/IsStream/Type.hs
index 80646696c..079bde28d 100644
--- a/src/Streamly/Internal/Data/Stream/IsStream/Type.hs
+++ b/src/Streamly/Internal/Data/Stream/IsStream/Type.hs
@@ -106,7 +106,8 @@ import Streamly.Internal.Data.Stream.WSerial (WSerialT(..), WSerial)
 import Streamly.Internal.Data.Stream.IsStream.Async
     (AsyncT(..), Async, WAsyncT(..), WAsync)
 import Streamly.Internal.Data.Stream.Ahead (AheadT(..), Ahead)
-import Streamly.Internal.Data.Stream.Parallel (ParallelT(..), Parallel)
+import Streamly.Internal.Data.Stream.IsStream.Parallel
+    (ParallelT(..), Parallel)
 import Streamly.Internal.Data.Stream.Zip (ZipSerialM, ZipSerial)
 import Streamly.Internal.Data.Stream.ZipAsync (ZipAsyncM(..), ZipAsync)
 import Streamly.Internal.Data.SVar.Type (State, adaptState)
@@ -114,7 +115,7 @@ import Streamly.Internal.Data.SVar.Type (State, adaptState)
 import qualified Prelude
 import qualified Streamly.Internal.Data.Stream.Ahead as Ahead
 import qualified Streamly.Internal.Data.Stream.IsStream.Async as Async
-import qualified Streamly.Internal.Data.Stream.Parallel as Parallel
+import qualified Streamly.Internal.Data.Stream.IsStream.Parallel as Parallel
 import qualified Streamly.Internal.Data.Stream.Serial as Serial
 import qualified Streamly.Internal.Data.Stream.WSerial as WSerial
 import qualified Streamly.Internal.Data.Stream.StreamD.Type as D
diff --git a/streamly.cabal b/streamly.cabal
index 8722cc49e..cefcf9b06 100644
--- a/streamly.cabal
+++ b/streamly.cabal
@@ -464,7 +464,6 @@ library
                      , Streamly.Internal.Data.Stream.Async.Channel.Operations
                      , Streamly.Internal.Data.Stream.Async.Channel
                      , Streamly.Internal.Data.Stream.Async
-                     , Streamly.Internal.Data.Stream.Parallel
                      , Streamly.Internal.Data.Stream.Ahead
                      , Streamly.Internal.Data.Stream.ZipAsync
 
@@ -481,6 +480,7 @@ library
                      , Streamly.Internal.Data.Stream.IsStream.Lift
                      , Streamly.Internal.Data.Stream.IsStream.Top
                      , Streamly.Internal.Data.Stream.IsStream.Async
+                     , Streamly.Internal.Data.Stream.IsStream.Parallel
                      , Streamly.Internal.Data.Stream.IsStream
 
                      -- streamly-serde