Skip to content
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

ApplyXXX methods not fully applied #1044

Merged
merged 3 commits into from
Feb 9, 2021
Merged

ApplyXXX methods not fully applied #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60b9f65
fix 1038 ApplyXXX methods not fully applied
julien-truffaut Feb 9, 2021
9fd9fa6
remove composePrism usages
julien-truffaut Feb 9, 2021
f173d32
Merge branch 'master' into bugfix/applyXXX-signature
julien-truffaut Feb 9, 2021
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
18 changes: 9 additions & 9 deletions core/shared/src/main/scala/monocle/syntax/ApplyFold.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import monocle.{std, Fold, Getter, Optional, PIso, PLens, POptional, PPrism, PTr
case class ApplyFold[S, A](s: S, _fold: Fold[S, A]) {
def foldMap[M: Monoid](f: A => M): M = _fold.foldMap(f)(s)

def getAll: List[A] = _fold.getAll(s)
def find(p: A => Boolean): S => Option[A] = _fold.find(p)
def headOption: Option[A] = _fold.headOption(s)
def lastOption: Option[A] = _fold.lastOption(s)
def exist(p: A => Boolean): Boolean = _fold.exist(p)(s)
def all(p: A => Boolean): Boolean = _fold.all(p)(s)
def length: Int = _fold.length(s)
def isEmpty: Boolean = _fold.isEmpty(s)
def nonEmpty: Boolean = _fold.nonEmpty(s)
def getAll: List[A] = _fold.getAll(s)
def find(p: A => Boolean): Option[A] = _fold.find(p)(s)
def headOption: Option[A] = _fold.headOption(s)
def lastOption: Option[A] = _fold.lastOption(s)
def exist(p: A => Boolean): Boolean = _fold.exist(p)(s)
def all(p: A => Boolean): Boolean = _fold.all(p)(s)
def length: Int = _fold.length(s)
def isEmpty: Boolean = _fold.isEmpty(s)
def nonEmpty: Boolean = _fold.nonEmpty(s)

def each[C](implicit evEach: Each[A, C]): ApplyFold[S, C] =
andThen(evEach.each)
Expand Down
6 changes: 3 additions & 3 deletions core/shared/src/main/scala/monocle/syntax/ApplyGetter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import monocle.function.{At, Each, FilterIndex, Index}
import monocle.{std, Fold, Getter, Optional, PIso, PLens, POptional, PPrism, PTraversal}

final case class ApplyGetter[S, A](s: S, getter: Getter[S, A]) {
def get: A = getter.get(s)
def exist(p: A => Boolean): S => Boolean = getter.exist(p)
def find(p: A => Boolean): S => Option[A] = getter.find(p)
def get: A = getter.get(s)
def exist(p: A => Boolean): Boolean = getter.exist(p)(s)
def find(p: A => Boolean): Option[A] = getter.find(p)(s)

def each[C](implicit evEach: Each[A, C]): ApplyFold[S, C] =
andThen(evEach.each)
Expand Down
6 changes: 3 additions & 3 deletions core/shared/src/main/scala/monocle/syntax/ApplyIso.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ final case class ApplyIso[S, T, A, B](s: S, iso: PIso[S, T, A, B]) {
def replace(b: B): T = iso.replace(b)(s)
def modify(f: A => B): T = iso.modify(f)(s)
def modifyF[F[_]: Functor](f: A => F[B]): F[T] = iso.modifyF(f)(s)
def exist(p: A => Boolean): S => Boolean = iso.exist(p)
def find(p: A => Boolean): S => Option[A] = iso.find(p)
def exist(p: A => Boolean): Boolean = iso.exist(p)(s)
def find(p: A => Boolean): Option[A] = iso.find(p)(s)

@deprecated("use replace instead", since = "3.0.0-M1")
def set(b: B): T = replace(b)

def some[A1, B1](implicit ev1: A =:= Option[A1], ev2: B =:= Option[B1]): ApplyPrism[S, T, A1, B1] =
adapt[Option[A1], Option[B1]] composePrism (std.option.pSome)
adapt[Option[A1], Option[B1]].andThen(std.option.pSome[A1, B1])

private[monocle] def adapt[A1, B1](implicit evA: A =:= A1, evB: B =:= B1): ApplyIso[S, T, A1, B1] =
evB.substituteCo[ApplyIso[S, T, A1, *]](evA.substituteCo[ApplyIso[S, T, *, B]](this))
Expand Down
4 changes: 2 additions & 2 deletions core/shared/src/main/scala/monocle/syntax/ApplyLens.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ final case class ApplyLens[S, T, A, B](s: S, lens: PLens[S, T, A, B]) {
def replace(b: B): T = lens.replace(b)(s)
def modify(f: A => B): T = lens.modify(f)(s)
def modifyF[F[_]: Functor](f: A => F[B]): F[T] = lens.modifyF(f)(s)
def exist(p: A => Boolean): S => Boolean = lens.exist(p)
def find(p: A => Boolean): S => Option[A] = lens.find(p)
def exist(p: A => Boolean): Boolean = lens.exist(p)(s)
def find(p: A => Boolean): Option[A] = lens.find(p)(s)

/** alias to replace */
@deprecated("use replace instead", since = "3.0.0-M1")
Expand Down
12 changes: 6 additions & 6 deletions core/shared/src/main/scala/monocle/syntax/ApplyOptional.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import monocle.{std, Fold, Optional, PIso, PLens, POptional, PPrism, PSetter, PT
final case class ApplyOptional[S, T, A, B](s: S, optional: POptional[S, T, A, B]) {
def getOption: Option[A] = optional.getOption(s)

def isEmpty(s: S): Boolean = optional.isEmpty(s)
def nonEmpty(s: S): Boolean = optional.nonEmpty(s)
def all(p: A => Boolean): S => Boolean = optional.all(p)
def isEmpty(s: S): Boolean = optional.isEmpty(s)
def nonEmpty(s: S): Boolean = optional.nonEmpty(s)
def all(p: A => Boolean): Boolean = optional.all(p)(s)

def exist(p: A => Boolean): S => Boolean = optional.exist(p)
def find(p: A => Boolean): S => Option[A] = optional.find(p)
def exist(p: A => Boolean): Boolean = optional.exist(p)(s)
def find(p: A => Boolean): Option[A] = optional.find(p)(s)

def modify(f: A => B): T = optional.modify(f)(s)
def modifyF[F[_]: Applicative](f: A => F[B]): F[T] =
Expand All @@ -31,7 +31,7 @@ final case class ApplyOptional[S, T, A, B](s: S, optional: POptional[S, T, A, B]
def setOption(b: B): Option[T] = replaceOption(b)

def some[A1, B1](implicit ev1: A =:= Option[A1], ev2: B =:= Option[B1]): ApplyOptional[S, T, A1, B1] =
adapt[Option[A1], Option[B1]] composePrism (std.option.pSome)
adapt[Option[A1], Option[B1]].andThen(std.option.pSome[A1, B1])

private[monocle] def adapt[A1, B1](implicit evA: A =:= A1, evB: B =:= B1): ApplyOptional[S, T, A1, B1] =
evB.substituteCo[ApplyOptional[S, T, A1, *]](evA.substituteCo[ApplyOptional[S, T, *, B]](this))
Expand Down
10 changes: 5 additions & 5 deletions core/shared/src/main/scala/monocle/syntax/ApplyTraversal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ final case class ApplyTraversal[S, T, A, B](s: S, traversal: PTraversal[S, T, A,
def modifyF[F[_]: Applicative](f: A => F[B]): F[T] =
traversal.modifyF(f)(s)

def find(p: A => Boolean): S => Option[A] = traversal.find(p)
def exist(p: A => Boolean): S => Boolean = traversal.exist(p)
def all(p: A => Boolean): S => Boolean = traversal.all(p)
def isEmpty(s: S): Boolean = traversal.isEmpty(s)
def nonEmpty(s: S): Boolean = traversal.nonEmpty(s)
def find(p: A => Boolean): Option[A] = traversal.find(p)(s)
def exist(p: A => Boolean): Boolean = traversal.exist(p)(s)
def all(p: A => Boolean): Boolean = traversal.all(p)(s)
def isEmpty(s: S): Boolean = traversal.isEmpty(s)
def nonEmpty(s: S): Boolean = traversal.nonEmpty(s)

/** alias to replace */
@deprecated("use replace instead", since = "3.0.0-M1")
Expand Down