Merge pull request #4279 from joroKr21/sam-instances

Use SAM syntax for typeclass instances where possible

algebra-core/src/main/scala/algebra/lattice/BoundedJoinSemilattice.scala

@@ -24,13 +24,13 @@ package lattice
 
 import scala.{specialized => sp}
 
-trait BoundedJoinSemilattice[@sp(Int, Long, Float, Double) A] extends Any with JoinSemilattice[A] { self =>
+trait BoundedJoinSemilattice[@sp(Int, Long, Float, Double) A] extends Any with JoinSemilattice[A] {
   def zero: A
   def isZero(a: A)(implicit ev: Eq[A]): Boolean = ev.eqv(a, zero)
 
   override def joinSemilattice: BoundedSemilattice[A] =
     new BoundedSemilattice[A] {
-      def empty: A = self.zero
+      def empty: A = zero
       def combine(x: A, y: A): A = join(x, y)
     }
 }

algebra-core/src/main/scala/algebra/lattice/BoundedMeetSemilattice.scala

@@ -24,13 +24,13 @@ package lattice
 
 import scala.{specialized => sp}
 
-trait BoundedMeetSemilattice[@sp(Int, Long, Float, Double) A] extends Any with MeetSemilattice[A] { self =>
+trait BoundedMeetSemilattice[@sp(Int, Long, Float, Double) A] extends Any with MeetSemilattice[A] {
   def one: A
   def isOne(a: A)(implicit ev: Eq[A]): Boolean = ev.eqv(a, one)
 
   override def meetSemilattice: BoundedSemilattice[A] =
     new BoundedSemilattice[A] {
-      def empty: A = self.one
+      def empty: A = one
       def combine(x: A, y: A): A = meet(x, y)
     }
 }

algebra-core/src/main/scala/algebra/lattice/JoinSemilattice.scala

@@ -29,13 +29,10 @@ import scala.{specialized => sp}
  * operation is called "join", and which can be thought of as a least
  * upper bound.
  */
-trait JoinSemilattice[@sp(Int, Long, Float, Double) A] extends Any with Serializable { self =>
+trait JoinSemilattice[@sp(Int, Long, Float, Double) A] extends Any with Serializable {
   def join(lhs: A, rhs: A): A
 
-  def joinSemilattice: Semilattice[A] =
-    new Semilattice[A] {
-      def combine(x: A, y: A): A = self.join(x, y)
-    }
+  def joinSemilattice: Semilattice[A] = join(_, _)
 
   def joinPartialOrder(implicit ev: Eq[A]): PartialOrder[A] =
     joinSemilattice.asJoinPartialOrder

algebra-core/src/main/scala/algebra/lattice/MeetSemilattice.scala

@@ -29,13 +29,10 @@ import scala.{specialized => sp}
  * operation is called "meet", and which can be thought of as a
  * greatest lower bound.
  */
-trait MeetSemilattice[@sp(Int, Long, Float, Double) A] extends Any with Serializable { self =>
+trait MeetSemilattice[@sp(Int, Long, Float, Double) A] extends Any with Serializable {
   def meet(lhs: A, rhs: A): A
 
-  def meetSemilattice: Semilattice[A] =
-    new Semilattice[A] {
-      def combine(x: A, y: A): A = self.meet(x, y)
-    }
+  def meetSemilattice: Semilattice[A] = meet(_, _)
 
   def meetPartialOrder(implicit ev: Eq[A]): PartialOrder[A] =
     meetSemilattice.asMeetPartialOrder

algebra-core/src/main/scala/algebra/ring/Multiplicative.scala

@@ -26,10 +26,7 @@ import scala.{specialized => sp}
 import scala.annotation.{nowarn, tailrec}
 
 trait MultiplicativeSemigroup[@sp(Int, Long, Float, Double) A] extends Any with Serializable {
-  def multiplicative: Semigroup[A] =
-    new Semigroup[A] {
-      def combine(x: A, y: A): A = times(x, y)
-    }
+  def multiplicative: Semigroup[A] = times(_, _)
 
   def times(x: A, y: A): A
 
@@ -58,9 +55,7 @@ trait MultiplicativeSemigroup[@sp(Int, Long, Float, Double) A] extends Any with
 }
 
 trait MultiplicativeCommutativeSemigroup[@sp(Int, Long, Float, Double) A] extends Any with MultiplicativeSemigroup[A] {
-  override def multiplicative: CommutativeSemigroup[A] = new CommutativeSemigroup[A] {
-    def combine(x: A, y: A): A = times(x, y)
-  }
+  override def multiplicative: CommutativeSemigroup[A] = times(_, _)
 }
 
 trait MultiplicativeMonoid[@sp(Int, Long, Float, Double) A] extends Any with MultiplicativeSemigroup[A] {

algebra-core/src/test/scala/algebra/Instances.scala

@@ -23,12 +23,6 @@ package algebra
 
 object Instances {
 
-  def t2HasSemigroup[A, B](implicit eva: Semigroup[A], evb: Semigroup[B]) =
-    new Semigroup[(A, B)] {
-      def combine(x: (A, B), y: (A, B)): (A, B) =
-        (eva.combine(x._1, y._1), evb.combine(x._2, y._2))
-    }
-
   val stringHasMonoid =
     new Monoid[String] {
       def empty: String = ""

algebra-laws/shared/src/test/scala/algebra/laws/FPApprox.scala

@@ -124,23 +124,14 @@ object FPApprox {
   implicit def fpApproxAlgebra[A: Field: Order: Epsilon]: FPApproxAlgebra[A] = new FPApproxAlgebra[A]
 
   // An Eq instance that returns true if 2 values *could* be equal.
-  implicit def fpApproxEq[A: Field: Order: Epsilon]: Eq[FPApprox[A]] =
-    new Eq[FPApprox[A]] {
-      def eqv(x: FPApprox[A], y: FPApprox[A]): Boolean = {
-        // We want to check if z +/- error contains 0
-        if (x.approx == y.approx) {
-          true
-        } else {
-          val z = x - y
-          val err = z.error
-          if (Epsilon.isFinite(err)) {
-            Order.lteqv(Ring[A].minus(z.approx, err), Ring[A].zero) &&
-            Order.gteqv(Ring[A].plus(z.approx, err), Ring[A].zero)
-          } else {
-            true
-          }
-        }
-      }
+  implicit def fpApproxEq[A: Field: Order: Epsilon]: Eq[FPApprox[A]] = (x, y) =>
+    // We want to check if z +/- error contains 0
+    x.approx == y.approx || {
+      val z = x - y
+      val err = z.error
+      !Epsilon.isFinite(err) ||
+      Order.lteqv(Ring[A].minus(z.approx, err), Ring[A].zero) &&
+      Order.gteqv(Ring[A].plus(z.approx, err), Ring[A].zero)
     }
 
   implicit def arbFPApprox[A: Rng: Order: Arbitrary]: Arbitrary[FPApprox[A]] =

algebra-laws/shared/src/test/scala/algebra/laws/LawTests.scala

@@ -177,13 +177,11 @@ class LawTests extends munit.DisciplineSuite {
     implicit val NOrderEq: Eq[Order[N]] = Eq.by { (order: Order[N]) =>
       Vector.tabulate(nMax)(N).sorted(order.toOrdering)
     }
-    implicit val NEqEq: Eq[Eq[N]] = new Eq[Eq[N]] {
-      def eqv(a: Eq[N], b: Eq[N]) =
-        Iterator
-          .tabulate(nMax)(N)
-          .flatMap { x => Iterator.tabulate(nMax)(N).map((x, _)) }
-          .forall { case (x, y) => a.eqv(x, y) == b.eqv(x, y) }
-    }
+    implicit val NEqEq: Eq[Eq[N]] = (a, b) =>
+      Iterator
+        .tabulate(nMax)(N)
+        .flatMap { x => Iterator.tabulate(nMax)(N).map((x, _)) }
+        .forall { case (x, y) => a.eqv(x, y) == b.eqv(x, y) }
 
     implicit val monoidOrderN: Monoid[Order[N]] = Order.whenEqualMonoid[N]
     checkAll("Order[N]", GroupLaws[Order[N]].monoid)

algebra-laws/shared/src/test/scala/algebra/laws/SimpleDeMorgan.scala

@@ -68,7 +68,6 @@ object SimpleDeMorgan {
 
   implicit val arbitrary: Arbitrary[SimpleDeMorgan] = Arbitrary(oneOf(False, Unknown, True))
 
-  implicit val eq: Eq[SimpleDeMorgan] = new Eq[SimpleDeMorgan] {
-    def eqv(x: SimpleDeMorgan, y: SimpleDeMorgan): Boolean = x == y
-  }
+  implicit val eq: Eq[SimpleDeMorgan] =
+    Eq.fromUniversalEquals
 }

algebra-laws/shared/src/test/scala/algebra/laws/SimpleHeyting.scala

@@ -74,7 +74,6 @@ object SimpleHeyting {
 
   implicit val arbitrary: Arbitrary[SimpleHeyting] = Arbitrary(oneOf(Zero, Half, One))
 
-  implicit val eq: Eq[SimpleHeyting] = new Eq[SimpleHeyting] {
-    def eqv(x: SimpleHeyting, y: SimpleHeyting): Boolean = x == y
-  }
+  implicit val eq: Eq[SimpleHeyting] =
+    Eq.fromUniversalEquals
 }

core/src/main/scala-2.12/cats/instances/stream.scala

@@ -194,9 +194,7 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
     }
 
   implicit def catsStdShowForStream[A: Show]: Show[Stream[A]] =
-    new Show[Stream[A]] {
-      def show(fa: Stream[A]): String = if (fa.isEmpty) "Stream()" else s"Stream(${fa.head.show}, ?)"
-    }
+    stream => if (stream.isEmpty) "Stream()" else s"Stream(${stream.head.show}, ?)"
 
   implicit def catsStdParallelForStreamZipStream: Parallel.Aux[Stream, ZipStream] =
     new Parallel[Stream] {

core/src/main/scala-2.13+/cats/data/NonEmptyLazyList.scala

@@ -553,8 +553,7 @@ sealed abstract private[data] class NonEmptyLazyListInstances extends NonEmptyLa
   implicit def catsDataSemigroupForNonEmptyLazyList[A]: Semigroup[NonEmptyLazyList[A]] =
     Semigroup[LazyList[A]].asInstanceOf[Semigroup[NonEmptyLazyList[A]]]
 
-  implicit def catsDataShowForNonEmptyLazyList[A](implicit A: Show[A]): Show[NonEmptyLazyList[A]] =
-    Show.show[NonEmptyLazyList[A]](_.show)
+  implicit def catsDataShowForNonEmptyLazyList[A: Show]: Show[NonEmptyLazyList[A]] = _.show
 
   implicit def catsDataParallelForNonEmptyLazyList: Parallel.Aux[NonEmptyLazyList, OneAnd[ZipLazyList, *]] =
     new Parallel[NonEmptyLazyList] {

core/src/main/scala-2.13+/cats/instances/arraySeq.scala

@@ -36,9 +36,7 @@ trait ArraySeqInstances extends cats.kernel.instances.ArraySeqInstances {
     ArraySeqInstances.stdTraverseFilterInstance
 
   implicit def catsStdShowForArraySeq[A](implicit ev: Show[A]): Show[ArraySeq[A]] =
-    Show.show { arraySeq =>
-      arraySeq.iterator.map(ev.show).mkString("ArraySeq(", ", ", ")")
-    }
+    _.iterator.map(ev.show).mkString("ArraySeq(", ", ", ")")
 }
 
 private[cats] object ArraySeqInstances {

core/src/main/scala-2.13+/cats/instances/lazyList.scala

@@ -176,9 +176,7 @@ trait LazyListInstances extends cats.kernel.instances.LazyListInstances {
     }
 
   implicit def catsStdShowForLazyList[A: Show]: Show[LazyList[A]] =
-    new Show[LazyList[A]] {
-      def show(fa: LazyList[A]): String = if (fa.isEmpty) "LazyList()" else s"LazyList(${fa.head.show}, ?)"
-    }
+    list => if (list.isEmpty) "LazyList()" else s"LazyList(${list.head.show}, ?)"
 
   implicit val catsStdTraverseFilterForLazyList: TraverseFilter[LazyList] = new TraverseFilter[LazyList] {
     val traverse: Traverse[LazyList] = catsStdInstancesForLazyList

core/src/main/scala-2.13+/cats/instances/stream.scala

@@ -196,9 +196,7 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
 
   @deprecated("Use cats.instances.lazyList", "2.0.0-RC2")
   implicit def catsStdShowForStream[A: Show]: Show[Stream[A]] =
-    new Show[Stream[A]] {
-      def show(fa: Stream[A]): String = if (fa.isEmpty) "Stream()" else s"Stream(${fa.head.show}, ?)"
-    }
+    stream => if (stream.isEmpty) "Stream()" else s"Stream(${stream.head.show}, ?)"
 
   @deprecated("Use catsStdParallelForZipLazyList", "2.0.0-RC2")
   implicit def catsStdParallelForStreamZipStream: Parallel.Aux[Stream, ZipStream] =

core/src/main/scala/cats/Align.scala

@@ -135,9 +135,7 @@ trait Align[F[_]] extends Serializable {
 
 object Align extends ScalaVersionSpecificAlignInstances {
   def semigroup[F[_], A](implicit F: Align[F], A: Semigroup[A]): Semigroup[F[A]] =
-    new Semigroup[F[A]] {
-      def combine(x: F[A], y: F[A]): F[A] = Align[F].alignCombine(x, y)
-    }
+    F.alignCombine(_, _)
 
   implicit def catsAlignForList: Align[List] = cats.instances.list.catsStdInstancesForList
   implicit def catsAlignForOption: Align[Option] = cats.instances.option.catsStdInstancesForOption

core/src/main/scala/cats/CommutativeApply.scala

@@ -36,11 +36,7 @@ trait CommutativeApply[F[_]] extends Apply[F]
 
 object CommutativeApply {
   def commutativeSemigroupFor[F[_]: CommutativeApply, A: CommutativeSemigroup]: CommutativeSemigroup[F[A]] =
-    new CommutativeSemigroup[F[A]] {
-      override def combine(x: F[A], y: F[A]): F[A] =
-        CommutativeApply[F]
-          .map2(x, y)(CommutativeSemigroup[A].combine)
-    }
+    CommutativeApply[F].map2(_, _)(CommutativeSemigroup[A].combine)
 
   /**
    * Summon an instance of [[CommutativeApply]] for `F`.

core/src/main/scala/cats/Eval.scala

@@ -431,10 +431,7 @@ sealed abstract private[cats] class EvalInstances extends EvalInstances0 {
     }
 
   implicit def catsOrderForEval[A: Order]: Order[Eval[A]] =
-    new Order[Eval[A]] {
-      def compare(lx: Eval[A], ly: Eval[A]): Int =
-        Order[A].compare(lx.value, ly.value)
-    }
+    Order.by(_.value)
 
   implicit def catsGroupForEval[A: Group]: Group[Eval[A]] =
     new EvalGroup[A] { val algebra: Group[A] = Group[A] }
@@ -458,21 +455,15 @@ sealed abstract private[cats] class EvalInstances extends EvalInstances0 {
 
 sealed abstract private[cats] class EvalInstances0 extends EvalInstances1 {
   implicit def catsPartialOrderForEval[A: PartialOrder]: PartialOrder[Eval[A]] =
-    new PartialOrder[Eval[A]] {
-      def partialCompare(lx: Eval[A], ly: Eval[A]): Double =
-        PartialOrder[A].partialCompare(lx.value, ly.value)
-    }
+    PartialOrder.by(_.value)
 
   implicit def catsMonoidForEval[A: Monoid]: Monoid[Eval[A]] =
     new EvalMonoid[A] { val algebra = Monoid[A] }
 }
 
 sealed abstract private[cats] class EvalInstances1 {
   implicit def catsEqForEval[A: Eq]: Eq[Eval[A]] =
-    new Eq[Eval[A]] {
-      def eqv(lx: Eval[A], ly: Eval[A]): Boolean =
-        Eq[A].eqv(lx.value, ly.value)
-    }
+    Eq.by(_.value)
 
   implicit def catsSemigroupForEval[A: Semigroup]: Semigroup[Eval[A]] =
     new EvalSemigroup[A] { val algebra = Semigroup[A] }

core/src/main/scala/cats/SemigroupK.scala

@@ -86,18 +86,15 @@ trait SemigroupK[F[_]] extends Serializable { self =>
     y.map(yy => combineK(x, yy))
 
   /**
-   * Given a type A, create a concrete Semigroup[F[A]].
+   * Given a type A, create a concrete `Semigroup[F[A]]`.
    *
    * Example:
    * {{{
    * scala> import cats.implicits._
    * scala> val s: Semigroup[List[Int]] = SemigroupK[List].algebra[Int]
    * }}}
    */
-  def algebra[A]: Semigroup[F[A]] =
-    new Semigroup[F[A]] {
-      def combine(x: F[A], y: F[A]): F[A] = self.combineK(x, y)
-    }
+  def algebra[A]: Semigroup[F[A]] = combineK(_, _)
 
   /**
    * "Compose" with a `G[_]` type to form a `SemigroupK` for `λ[α => F[G[α]]]`.

core/src/main/scala/cats/Show.scala

@@ -80,8 +80,7 @@ object Show extends ScalaVersionSpecificShowInstances with ShowInstances {
   }
 
   implicit val catsContravariantForShow: Contravariant[Show] = new Contravariant[Show] {
-    def contramap[A, B](fa: Show[A])(f: B => A): Show[B] =
-      show[B]((fa.show _).compose(f))
+    def contramap[A, B](fa: Show[A])(f: B => A): Show[B] = b => fa.show(f(b))
   }
 
   implicit def catsShowForUnit: Show[Unit] = cats.instances.unit.catsStdShowForUnit

core/src/main/scala/cats/arrow/Compose.scala

@@ -49,10 +49,7 @@ trait Compose[F[_, _]] extends Serializable { self =>
       def combineK[A](f1: F[A, A], f2: F[A, A]): F[A, A] = self.compose(f1, f2)
     }
 
-  def algebra[A]: Semigroup[F[A, A]] =
-    new Semigroup[F[A, A]] {
-      def combine(f1: F[A, A], f2: F[A, A]): F[A, A] = self.compose(f1, f2)
-    }
+  def algebra[A]: Semigroup[F[A, A]] = compose(_, _)
 }
 
 object Compose {

core/src/main/scala/cats/data/Chain.scala

@@ -858,7 +858,8 @@ sealed abstract class Chain[+A] extends ChainCompat[A] {
   def hash[AA >: A](implicit hashA: Hash[AA]): Int =
     KernelStaticMethods.orderedHash((this: Chain[AA]).iterator)
 
-  override def toString: String = show(Show.show[A](_.toString))
+  override def toString: String =
+    show(Show.fromToString)
 
   override def equals(o: Any): Boolean =
     o match {
@@ -1320,8 +1321,7 @@ sealed abstract private[data] class ChainInstances extends ChainInstances1 {
       }
     }
 
-  implicit def catsDataShowForChain[A](implicit A: Show[A]): Show[Chain[A]] =
-    Show.show[Chain[A]](_.show)
+  implicit def catsDataShowForChain[A: Show]: Show[Chain[A]] = _.show
 
   implicit def catsDataOrderForChain[A](implicit A0: Order[A]): Order[Chain[A]] =
     new Order[Chain[A]] with ChainPartialOrder[A] {