Fix missed vals to defs

typelevel · Jul 7, 2023 · ebf2567 · ebf2567
1 parent 6ec5b23
commit ebf2567
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/core/src/main/scala/cats/instances/eq.scala b/core/src/main/scala/cats/instances/eq.scala
@@ -46,7 +46,7 @@ trait EqInstances extends kernel.instances.EqInstances {
         (left, right) => fa.eqv(left._1, right._1) && fb.eqv(left._2, right._2)
     }
 
-  implicit val catsDeferForEq: Defer[Eq] = EqInstances.catsDeferForEqCache
+  implicit def catsDeferForEq: Defer[Eq] = EqInstances.catsDeferForEqCache
 }
 object EqInstances {
   private val catsDeferForEqCache: Defer[Eq] =

diff --git a/core/src/main/scala/cats/instances/equiv.scala b/core/src/main/scala/cats/instances/equiv.scala
@@ -55,7 +55,7 @@ trait EquivInstances {
         }
     }
 
-  implicit val catsDeferForEquiv: Defer[Equiv] = EquivInstances.catsDeferForEquivCache
+  implicit def catsDeferForEquiv: Defer[Equiv] = EquivInstances.catsDeferForEquivCache
 }
 object EquivInstances {
   private val catsDeferForEquivCache: Defer[Equiv] =

diff --git a/core/src/main/scala/cats/instances/hash.scala b/core/src/main/scala/cats/instances/hash.scala
@@ -36,7 +36,7 @@ trait HashInstances extends kernel.instances.HashInstances {
 
     }
 
-  implicit val catsDeferForHash: Defer[Hash] = HashInstances.catsDeferForHashCache
+  implicit def catsDeferForHash: Defer[Hash] = HashInstances.catsDeferForHashCache
 }
 object HashInstances {
   private val catsDeferForHashCache: Defer[Hash] =

diff --git a/core/src/main/scala/cats/instances/order.scala b/core/src/main/scala/cats/instances/order.scala
@@ -50,7 +50,7 @@ trait OrderInstances extends kernel.instances.OrderInstances {
       }
     }
 
-  implicit val catsDeferForOrder: Defer[Order] = OrderInstances.catsDeferForOrderCache
+  implicit def catsDeferForOrder: Defer[Order] = OrderInstances.catsDeferForOrderCache
 }
 object OrderInstances {
   private val catsDeferForOrderCache: Defer[Order] =

diff --git a/core/src/main/scala/cats/instances/ordering.scala b/core/src/main/scala/cats/instances/ordering.scala
@@ -46,22 +46,23 @@ trait OrderingInstances {
         }
     }
 
-  implicit val catsStdDeferForOrdering: Defer[Ordering] = OrderingInstances.catsStdDeferForOrderingCache
+  implicit def catsStdDeferForOrdering: Defer[Ordering] = OrderingInstances.catsStdDeferForOrderingCache
 }
 object OrderingInstances {
   private val catsStdDeferForOrderingCache: Defer[Ordering] =
     new Defer[Ordering] {
       case class Deferred[A](fa: () => Ordering[A]) extends Ordering[A] {
-        override def compare(x: A, y: A): Int = {
+        private lazy val resolved: Ordering[A] = {
           @tailrec
-          def loop(f: () => Ordering[A]): Int =
+          def loop(f: () => Ordering[A]): Ordering[A] =
             f() match {
               case Deferred(f) => loop(f)
-              case next        => next.compare(x, y)
+              case next => next
             }
 
           loop(fa)
         }
+        override def compare(x: A, y: A): Int = resolved.compare(x, y)
       }
 
       override def defer[A](fa: => Ordering[A]): Ordering[A] = {

diff --git a/core/src/main/scala/cats/instances/partialOrder.scala b/core/src/main/scala/cats/instances/partialOrder.scala
@@ -44,7 +44,7 @@ trait PartialOrderInstances extends kernel.instances.PartialOrderInstances {
       def unit: PartialOrder[Unit] = Order[Unit]
     }
 
-  implicit val catsDeferForPartialOrder: Defer[PartialOrder] = PartialOrderInstances.catsDeferForPartialOrderCache
+  implicit def catsDeferForPartialOrder: Defer[PartialOrder] = PartialOrderInstances.catsDeferForPartialOrderCache
 }
 object PartialOrderInstances {
   private val catsDeferForPartialOrderCache: Defer[PartialOrder] =

diff --git a/core/src/main/scala/cats/instances/partialOrdering.scala b/core/src/main/scala/cats/instances/partialOrdering.scala
@@ -53,7 +53,7 @@ trait PartialOrderingInstances {
       def unit: PartialOrdering[Unit] = cats.instances.unit.catsKernelStdOrderForUnit.toOrdering
     }
 
-  implicit val catsStdDeferForPartialOrdering: Defer[PartialOrdering] =
+  implicit def catsStdDeferForPartialOrdering: Defer[PartialOrdering] =
     PartialOrderingInstances.catsStdDeferForPartialOrderingCache
 }
 object PartialOrderingInstances {

diff --git a/core/src/main/scala/cats/instances/show.scala b/core/src/main/scala/cats/instances/show.scala
@@ -25,7 +25,7 @@ package instances
 import scala.annotation.tailrec
 
 trait ShowInstances {
-  implicit val catsDeferForShow: Defer[Show] = ShowInstances.catsDeferForShowCache
+  implicit def catsDeferForShow: Defer[Show] = ShowInstances.catsDeferForShowCache
 }
 object ShowInstances {
   private val catsDeferForShowCache: Defer[Show] =