Skip to content

Weaken some Alternative constraints in OneAnd #4739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+27 −6
Open

Weaken some Alternative constraints in OneAnd #4739

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
585e755
Weaken some `Alternative` constraints in `OneAnd`
kory33 Apr 20, 2025
c2d1444
Fix bincompat errors
kory33 Apr 20, 2025
af23366
Make `OneAndBinCompat0` sealed and make use of self-type annotation
kory33 May 8, 2025
175dd2a
Strip off deprecated annotation and make `OneAndInstancesBinCompat0` …
kory33 May 8, 2025
e059ed8
Let superseded methods invoke new implementation through `self`
kory33 May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions core/src/main/scala/cats/data/OneAnd.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ import kernel.compat.scalaVersionSpecific.*
* type NonEmptyStream[A] = OneAnd[Stream, A]
* }}}
*/
final case class OneAnd[F[_], A](head: A, tail: F[A]) {
final case class OneAnd[F[_], A](head: A, tail: F[A]) extends OneAndBinCompat0[F, A] {

/**
* Combine the head and tail into a single `F[A]` value.
*/
def unwrap(implicit F: Alternative[F]): F[A] =
def unwrap(implicit F: NonEmptyAlternative[F]): F[A] =
F.prependK(head, tail)

/**
Expand All @@ -53,7 +53,7 @@ final case class OneAnd[F[_], A](head: A, tail: F[A]) {
/**
* Append another OneAnd to this
*/
def combine(other: OneAnd[F, A])(implicit F: Alternative[F]): OneAnd[F, A] =
def combine(other: OneAnd[F, A])(implicit F: NonEmptyAlternative[F]): OneAnd[F, A] =
OneAnd(head, F.combineK(tail, other.unwrap))

/**
Expand Down Expand Up @@ -123,8 +123,18 @@ final case class OneAnd[F[_], A](head: A, tail: F[A]) {
s"OneAnd(${A.show(head)}, ${FA.show(tail)})"
}

sealed private[data] trait OneAndBinCompat0[F[_], A] { self: OneAnd[F, A] =>
// Kept for binary compatibility
private[data] def unwrap(F: Alternative[F]): F[A] =
self.unwrap(F)

// Kept for binary compatibility
private[data] def combine(other: OneAnd[F, A])(F: Alternative[F]): OneAnd[F, A] =
self.combine(other)(F)
}

@suppressUnusedImportWarningForScalaVersionSpecific
sealed abstract private[data] class OneAndInstances extends OneAndLowPriority0 {
sealed abstract private[data] class OneAndInstances extends OneAndLowPriority0 with OneAndInstancesBinCompat0 {

implicit def catsDataParallelForOneAnd[A, M[_]: Alternative, F0[_]: Alternative](implicit
P: Parallel.Aux[M, F0]
Expand Down Expand Up @@ -158,13 +168,13 @@ sealed abstract private[data] class OneAndInstances extends OneAndLowPriority0 {

implicit def catsDataShowForOneAnd[A, F[_]](implicit A: Show[A], FA: Show[F[A]]): Show[OneAnd[F, A]] = _.show

implicit def catsDataSemigroupKForOneAnd[F[_]: Alternative]: SemigroupK[OneAnd[F, *]] =
implicit def catsDataSemigroupKForOneAnd[F[_]: NonEmptyAlternative]: SemigroupK[OneAnd[F, *]] =
new SemigroupK[OneAnd[F, *]] {
def combineK[A](a: OneAnd[F, A], b: OneAnd[F, A]): OneAnd[F, A] =
a.combine(b)
}

implicit def catsDataSemigroupForOneAnd[F[_]: Alternative, A]: Semigroup[OneAnd[F, A]] =
implicit def catsDataSemigroupForOneAnd[F[_]: NonEmptyAlternative, A]: Semigroup[OneAnd[F, A]] =
catsDataSemigroupKForOneAnd[F].algebra

implicit def catsDataMonadForOneAnd[F[_]](implicit
Expand Down Expand Up @@ -331,4 +341,15 @@ sealed abstract private[data] class OneAndLowPriority0 extends OneAndLowPriority
}
}

sealed private[data] trait OneAndInstancesBinCompat0 { self: OneAndInstances =>

// Kept for binary compatibility
def catsDataSemigroupKForOneAnd[F[_]](F: Alternative[F]): SemigroupK[OneAnd[F, *]] =
self.catsDataSemigroupKForOneAnd[F](F)

// Kept for binary compatibility
def catsDataSemigroupForOneAnd[F[_], A](F: Alternative[F]): Semigroup[OneAnd[F, A]] =
self.catsDataSemigroupKForOneAnd[F](F).algebra
}

object OneAnd extends OneAndInstances