Rename FoldableFlatMap to AbstractFoldableFlatMap

joroKr21 · joroKr21 · commit 722be3531097 · 2025-11-10T08:28:10.000+01:00
diff --git a/core/src/main/scala-2.13+/cats/instances/arraySeq.scala b/core/src/main/scala-2.13+/cats/instances/arraySeq.scala
@@ -42,7 +42,7 @@ trait ArraySeqInstances extends cats.kernel.instances.ArraySeqInstances {
 private[cats] object ArraySeqInstances {
   final private val stdInstances
     : Traverse[ArraySeq] & Monad[ArraySeq] & Alternative[ArraySeq] & CoflatMap[ArraySeq] & Align[ArraySeq] =
-    new FlatMap.FoldableFlatMap[ArraySeq]
+    new FlatMap.AbstractFoldableFlatMap[ArraySeq]
       with Traverse[ArraySeq]
       with Monad[ArraySeq]
       with Alternative[ArraySeq]
diff --git a/core/src/main/scala-2.13+/cats/instances/lazyList.scala b/core/src/main/scala-2.13+/cats/instances/lazyList.scala
@@ -35,7 +35,7 @@ trait LazyListInstances extends cats.kernel.instances.LazyListInstances {
 
   implicit val catsStdInstancesForLazyList
     : Traverse[LazyList] & Alternative[LazyList] & Monad[LazyList] & CoflatMap[LazyList] & Align[LazyList] =
-    new FlatMap.FoldableFlatMap[LazyList]
+    new FlatMap.AbstractFoldableFlatMap[LazyList]
       with Traverse[LazyList]
       with Alternative[LazyList]
       with Monad[LazyList]
diff --git a/core/src/main/scala-2.13+/cats/instances/stream.scala b/core/src/main/scala-2.13+/cats/instances/stream.scala
@@ -34,7 +34,7 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
   @deprecated("Use cats.instances.lazyList", "2.0.0-RC2")
   implicit val catsStdInstancesForStream
     : Traverse[Stream] & Alternative[Stream] & Monad[Stream] & CoflatMap[Stream] & Align[Stream] =
-    new FlatMap.FoldableFlatMap[Stream]
+    new FlatMap.AbstractFoldableFlatMap[Stream]
       with Traverse[Stream]
       with Alternative[Stream]
       with Monad[Stream]
diff --git a/core/src/main/scala/cats/FlatMap.scala b/core/src/main/scala/cats/FlatMap.scala
@@ -221,7 +221,7 @@ trait FlatMap[F[_]] extends Apply[F] with FlatMapArityFunctions[F] {
 
 object FlatMap {
   abstract private[cats] class AbstractFlatMap[F[_]] extends Apply.AbstractApply[F] with FlatMap[F]
-  abstract private[cats] class FoldableFlatMap[F[_]] extends AbstractFlatMap[F] with Foldable[F]
+  abstract private[cats] class AbstractFoldableFlatMap[F[_]] extends AbstractFlatMap[F] with Foldable[F]
 
   /**
    * Summon an instance of [[FlatMap]] for `F`.
diff --git a/core/src/main/scala/cats/data/AbstractNonEmptyInstances.scala b/core/src/main/scala/cats/data/AbstractNonEmptyInstances.scala
@@ -27,7 +27,7 @@ abstract private[data] class AbstractNonEmptyInstances[F[_], NonEmptyF[_]](impli
   CF: CoflatMap[F],
   TF: Traverse[F],
   SF: Alternative[F]
-) extends FlatMap.FoldableFlatMap[NonEmptyF]
+) extends FlatMap.AbstractFoldableFlatMap[NonEmptyF]
     with Bimonad[NonEmptyF]
     with NonEmptyTraverse[NonEmptyF]
     with NonEmptyAlternative[NonEmptyF] {
diff --git a/core/src/main/scala/cats/data/Chain.scala b/core/src/main/scala/cats/data/Chain.scala
@@ -1397,7 +1397,7 @@ sealed abstract private[data] class ChainInstances extends ChainInstances1 {
 
   implicit val catsDataInstancesForChain
     : Traverse[Chain] & Alternative[Chain] & Monad[Chain] & CoflatMap[Chain] & Align[Chain] =
-    new FlatMap.FoldableFlatMap[Chain]
+    new FlatMap.AbstractFoldableFlatMap[Chain]
       with Traverse[Chain]
       with Alternative[Chain]
       with Monad[Chain]
diff --git a/core/src/main/scala/cats/data/NonEmptyList.scala b/core/src/main/scala/cats/data/NonEmptyList.scala
@@ -815,7 +815,7 @@ sealed abstract private[data] class NonEmptyListInstances extends NonEmptyListIn
     : NonEmptyAlternative[NonEmptyList] & Bimonad[NonEmptyList] & NonEmptyTraverse[NonEmptyList] & Align[
       NonEmptyList
     ] =
-    new FlatMap.FoldableFlatMap[NonEmptyList]
+    new FlatMap.AbstractFoldableFlatMap[NonEmptyList]
       with NonEmptyReducibleTrait[NonEmptyList, List]
       with NonEmptyAlternative[NonEmptyList]
       with Bimonad[NonEmptyList]
diff --git a/core/src/main/scala/cats/data/NonEmptySeq.scala b/core/src/main/scala/cats/data/NonEmptySeq.scala
@@ -417,7 +417,7 @@ sealed abstract private[data] class NonEmptySeqInstances {
    */
   implicit val catsDataInstancesForNonEmptySeqBinCompat1
     : NonEmptyAlternative[NonEmptySeq] & Bimonad[NonEmptySeq] & NonEmptyTraverse[NonEmptySeq] & Align[NonEmptySeq] =
-    new FlatMap.FoldableFlatMap[NonEmptySeq]
+    new FlatMap.AbstractFoldableFlatMap[NonEmptySeq]
       with NonEmptyReducibleTrait[NonEmptySeq, Seq]
       with NonEmptyAlternative[NonEmptySeq]
       with Bimonad[NonEmptySeq]
diff --git a/core/src/main/scala/cats/data/NonEmptyVector.scala b/core/src/main/scala/cats/data/NonEmptyVector.scala
@@ -410,7 +410,7 @@ sealed abstract private[data] class NonEmptyVectorInstances extends NonEmptyVect
     : NonEmptyAlternative[NonEmptyVector] & Bimonad[NonEmptyVector] & NonEmptyTraverse[NonEmptyVector] & Align[
       NonEmptyVector
     ] =
-    new FlatMap.FoldableFlatMap[NonEmptyVector]
+    new FlatMap.AbstractFoldableFlatMap[NonEmptyVector]
       with NonEmptyReducibleTrait[NonEmptyVector, Vector]
       with NonEmptyAlternative[NonEmptyVector]
       with Bimonad[NonEmptyVector]
diff --git a/core/src/main/scala/cats/instances/either.scala b/core/src/main/scala/cats/instances/either.scala
@@ -58,7 +58,7 @@ trait EitherInstances extends cats.kernel.instances.EitherInstances {
 
   implicit def catsStdInstancesForEither[A]
     : MonadError[Either[A, *], A] & Traverse[Either[A, *]] & Align[Either[A, *]] =
-    new FlatMap.FoldableFlatMap[Either[A, *]]
+    new FlatMap.AbstractFoldableFlatMap[Either[A, *]]
       with MonadError[Either[A, *], A]
       with Traverse[Either[A, *]]
       with Align[Either[A, *]] {
diff --git a/core/src/main/scala/cats/instances/list.scala b/core/src/main/scala/cats/instances/list.scala
@@ -35,7 +35,7 @@ trait ListInstances extends cats.kernel.instances.ListInstances {
 
   implicit val catsStdInstancesForList
     : Traverse[List] & Alternative[List] & Monad[List] & CoflatMap[List] & Align[List] =
-    new FlatMap.FoldableFlatMap[List]
+    new FlatMap.AbstractFoldableFlatMap[List]
       with Traverse[List]
       with Alternative[List]
       with Monad[List]
diff --git a/core/src/main/scala/cats/instances/option.scala b/core/src/main/scala/cats/instances/option.scala
@@ -31,7 +31,7 @@ trait OptionInstances extends cats.kernel.instances.OptionInstances {
   implicit val catsStdInstancesForOption: Traverse[Option] & MonadError[Option, Unit] & Alternative[
     Option
   ] & CommutativeMonad[Option] & CoflatMap[Option] & Align[Option] =
-    new FlatMap.FoldableFlatMap[Option]
+    new FlatMap.AbstractFoldableFlatMap[Option]
       with Traverse[Option]
       with MonadError[Option, Unit]
       with Alternative[Option]
diff --git a/core/src/main/scala/cats/instances/queue.scala b/core/src/main/scala/cats/instances/queue.scala
@@ -34,7 +34,7 @@ import scala.util.Try
 trait QueueInstances extends cats.kernel.instances.QueueInstances {
 
   implicit val catsStdInstancesForQueue: Traverse[Queue] & Alternative[Queue] & Monad[Queue] & CoflatMap[Queue] =
-    new FlatMap.FoldableFlatMap[Queue]
+    new FlatMap.AbstractFoldableFlatMap[Queue]
       with Traverse[Queue]
       with Alternative[Queue]
       with Monad[Queue]
diff --git a/core/src/main/scala/cats/instances/seq.scala b/core/src/main/scala/cats/instances/seq.scala
@@ -33,7 +33,7 @@ import scala.collection.immutable.Seq
 @suppressUnusedImportWarningForScalaVersionSpecific
 trait SeqInstances extends cats.kernel.instances.SeqInstances {
   implicit val catsStdInstancesForSeq: Traverse[Seq] & Monad[Seq] & Alternative[Seq] & CoflatMap[Seq] & Align[Seq] =
-    new FlatMap.FoldableFlatMap[Seq]
+    new FlatMap.AbstractFoldableFlatMap[Seq]
       with Traverse[Seq]
       with Monad[Seq]
       with Alternative[Seq]
diff --git a/core/src/main/scala/cats/instances/sortedMap.scala b/core/src/main/scala/cats/instances/sortedMap.scala
@@ -50,7 +50,7 @@ trait SortedMapInstances extends SortedMapInstances2 {
 
   implicit def catsStdInstancesForSortedMap[K]
     : Traverse[SortedMap[K, *]] & FlatMap[SortedMap[K, *]] & Align[SortedMap[K, *]] =
-    new FlatMap.FoldableFlatMap[SortedMap[K, *]] with Traverse[SortedMap[K, *]] with Align[SortedMap[K, *]] {
+    new FlatMap.AbstractFoldableFlatMap[SortedMap[K, *]] with Traverse[SortedMap[K, *]] with Align[SortedMap[K, *]] {
 
       def traverse[G[_], A, B](fa: SortedMap[K, A])(f: A => G[B])(implicit G: Applicative[G]): G[SortedMap[K, B]] = {
         implicit val ordering: Ordering[K] = fa.ordering
diff --git a/core/src/main/scala/cats/instances/try.scala b/core/src/main/scala/cats/instances/try.scala
@@ -31,7 +31,7 @@ import scala.annotation.tailrec
 trait TryInstances extends TryInstances1 {
 
   implicit def catsStdInstancesForTry: MonadThrow[Try] & CoflatMap[Try] & Traverse[Try] & Monad[Try] =
-    new FlatMap.FoldableFlatMap[Try] with TryCoflatMap with MonadThrow[Try] with Traverse[Try] with Monad[Try] {
+    new FlatMap.AbstractFoldableFlatMap[Try] with TryCoflatMap with MonadThrow[Try] with Traverse[Try] with Monad[Try] {
       def pure[A](x: A): Try[A] = Success(x)
 
       override def product[A, B](ta: Try[A], tb: Try[B]): Try[(A, B)] =
diff --git a/core/src/main/scala/cats/instances/vector.scala b/core/src/main/scala/cats/instances/vector.scala
@@ -32,7 +32,7 @@ import scala.collection.immutable.VectorBuilder
 trait VectorInstances extends cats.kernel.instances.VectorInstances {
   implicit val catsStdInstancesForVector
     : Traverse[Vector] & Monad[Vector] & Alternative[Vector] & CoflatMap[Vector] & Align[Vector] =
-    new FlatMap.FoldableFlatMap[Vector]
+    new FlatMap.AbstractFoldableFlatMap[Vector]
       with Traverse[Vector]
       with Monad[Vector]
       with Alternative[Vector]
diff --git a/core/src/main/scala/cats/package.scala b/core/src/main/scala/cats/package.scala
@@ -97,7 +97,7 @@ package object cats {
   type Endo[A] = A => A
 
   val catsInstancesForId: Bimonad[Id] & CommutativeMonad[Id] & NonEmptyTraverse[Id] & Distributive[Id] =
-    new FlatMap.FoldableFlatMap[Id]
+    new FlatMap.AbstractFoldableFlatMap[Id]
       with Bimonad[Id]
       with CommutativeMonad[Id]
       with NonEmptyTraverse[Id]
