Remove Cause

zio · Dec 27, 2024 · 1bf899d · 1bf899d
1 parent c567bfc
commit 1bf899d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 40 deletions.
diff --git a/core/shared/src/main/scala/zio/prelude/Associative.scala b/core/shared/src/main/scala/zio/prelude/Associative.scala
@@ -1453,15 +1453,17 @@ object Associative extends AssociativeLowPriority {
 
 trait AssociativeLowPriority {
 
-  implicit def FxCauseProdAssociative[A]: Associative[Prod[fx.Cause[A]]] = new Associative[Prod[fx.Cause[A]]] {
-    def combine(l: => Prod[fx.Cause[A]], r: => Prod[fx.Cause[A]]): Prod[fx.Cause[A]] =
-      Prod(Prod.unwrap(l) ++ Prod.unwrap(r))
-  }
+  implicit def parSeqProdAssociative[A]: Associative[Prod[ParSeq[Unit, A]]] =
+    new Associative[Prod[ParSeq[Unit, A]]] {
+      def combine(l: => Prod[ParSeq[Unit, A]], r: => Prod[ParSeq[Unit, A]]): Prod[ParSeq[Unit, A]] =
+        Prod(Prod.unwrap(l) ++ Prod.unwrap(r))
+    }
 
-  implicit def FxCauseSumCommutative[A]: Commutative[Sum[fx.Cause[A]]] = new Commutative[Sum[fx.Cause[A]]] {
-    def combine(l: => Sum[fx.Cause[A]], r: => Sum[fx.Cause[A]]): Sum[fx.Cause[A]] =
-      Sum(Sum.unwrap(l) && Sum.unwrap(r))
-  }
+  implicit def parSeqSumCommutative[A]: Commutative[Sum[ParSeq[Unit, A]]] =
+    new Commutative[Sum[ParSeq[Unit, A]]] {
+      def combine(l: => Sum[ParSeq[Unit, A]], r: => Sum[ParSeq[Unit, A]]): Sum[ParSeq[Unit, A]] =
+        Sum(Sum.unwrap(l) && Sum.unwrap(r))
+    }
 
   /**
    * The `Commutative` and `PartialInverse` instance for the product of `Int` values.

diff --git a/core/shared/src/main/scala/zio/prelude/fx/package.scala b/core/shared/src/main/scala/zio/prelude/fx/package.scala
diff --git a/docs/functional-abstractions/abstraction-diagrams.md b/docs/functional-abstractions/abstraction-diagrams.md
@@ -312,7 +312,6 @@ classDiagram
   DistributiveProd~A~ <|-- Annihilation~A~
   class DistributiveProd~A~{
     Cause[A]
-    fx.Cause[A]
     ParSeq[Unit, A]
     
     () Sum: Associative[Sum[A]]

diff --git a/experimental/shared/src/main/scala/zio/prelude/experimental/DistributiveProd.scala b/experimental/shared/src/main/scala/zio/prelude/experimental/DistributiveProd.scala
@@ -124,10 +124,10 @@ object DistributiveProd extends DistributiveProdLowPriorityImplicits {
 
 trait DistributiveProdLowPriorityImplicits {
 
-  implicit def FxCauseDistributiveProd[A]: DistributiveProd[fx.Cause[A]] =
-    new DistributiveProd[fx.Cause[A]] {
-      val Sum: Associative[Sum[fx.Cause[A]]]   = Associative.FxCauseSumCommutative
-      val Prod: Associative[Prod[fx.Cause[A]]] = Associative.FxCauseProdAssociative
+  implicit def parSeqDistributiveProd[A]: DistributiveProd[ParSeq[Unit, A]] =
+    new DistributiveProd[ParSeq[Unit, A]] {
+      val Sum: Associative[Sum[ParSeq[Unit, A]]]   = Associative.parSeqSumCommutative
+      val Prod: Associative[Prod[ParSeq[Unit, A]]] = Associative.parSeqProdAssociative
     }
 
 }

diff --git a/laws/shared/src/main/scala/zio/prelude/laws/Gens.scala b/laws/shared/src/main/scala/zio/prelude/laws/Gens.scala
@@ -18,7 +18,6 @@ package zio.prelude.laws
 
 import zio.Trace
 import zio.prelude._
-import zio.prelude.fx.Cause
 import zio.prelude.newtypes.Natural
 import zio.test._
 
@@ -41,23 +40,23 @@ object Gens {
     Gen.int(min, max).map(Natural.unsafeMake)
 
   def parSeq[R <: Sized, Z <: Unit, A](z: Gen[R, Z], a: Gen[R, A]): Gen[R, ParSeq[Z, A]] = {
-    val failure = a.map(Cause.single)
-    val empty   = z.map(_ => Cause.empty.asInstanceOf[ParSeq[Nothing, Nothing]])
+    val failure = a.map(ParSeq.single)
+    val empty   = z.map(_ => ParSeq.empty.asInstanceOf[ParSeq[Nothing, Nothing]])
 
     def sequential(n: Int) = Gen.suspend {
       for {
         i <- Gen.int(1, n - 1)
         l <- parSeqN(i)
         r <- parSeqN(n - i)
-      } yield Cause.Then(l, r)
+      } yield ParSeq.Then(l, r)
     }
 
     def parallel(n: Int) = Gen.suspend {
       for {
         i <- Gen.int(1, n - 1)
         l <- parSeqN(i)
         r <- parSeqN(n - i)
-      } yield Cause.Both(l, r)
+      } yield ParSeq.Both(l, r)
     }
 
     def parSeqN(n: Int): Gen[R, ParSeq[Z, A]] = Gen.suspend {