Skip to content

Commit c2bdebf

Browse files
committed
fix/suppress in 'kernel-laws'
1 parent c442521 commit c2bdebf

File tree

8 files changed

+44
-17
lines changed

8 files changed

+44
-17
lines changed

kernel-laws/shared/src/main/scala/cats/kernel/laws/MonoidLaws.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait MonoidLaws[A] extends SemigroupLaws[A] {
3535
def repeat0(x: A): IsEq[A] =
3636
S.combineN(x, 0) <-> S.empty
3737

38-
def collect0(x: A): IsEq[A] =
38+
def collect0: IsEq[A] =
3939
S.combineAll(Nil) <-> S.empty
4040

4141
def combineAll(xs: Vector[A]): IsEq[A] =
@@ -44,6 +44,8 @@ trait MonoidLaws[A] extends SemigroupLaws[A] {
4444
def isId(x: A, eqv: Eq[A]): IsEq[Boolean] =
4545
eqv.eqv(x, S.empty) <-> S.isEmpty(x)(eqv)
4646

47+
@deprecated("use `collect0` without parameters", "2.12.1")
48+
def collect0(x: A): IsEq[A] = collect0
4749
}
4850

4951
object MonoidLaws {

kernel-laws/shared/src/main/scala/cats/kernel/laws/OrderLaws.scala

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
package cats.kernel
2323
package laws
2424

25-
import cats.kernel.Order
26-
2725
trait OrderLaws[A] extends PartialOrderLaws[A] {
2826

2927
implicit override def E: Order[A]

kernel-laws/shared/src/main/scala/cats/kernel/laws/discipline/BoundedTests.scala

+10-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ import org.scalacheck.Prop.forAll
3131
trait LowerBoundedTests[A] extends PartialOrderTests[A] {
3232
def laws: LowerBoundedLaws[A]
3333

34-
def lowerBounded(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
34+
def lowerBounded(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
3535
new DefaultRuleSet(
3636
"lowerBounded",
3737
Some(partialOrder),
3838
"bound is less than or equals" -> forAll(laws.boundLteqv _)
3939
)
40+
41+
@deprecated("use `lowerBounded` without `Eq` parameters", "2.12.1")
42+
def lowerBounded(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
43+
lowerBounded(arbA, arbF)
4044
}
4145

4246
object LowerBoundedTests {
@@ -47,12 +51,16 @@ object LowerBoundedTests {
4751
trait UpperBoundedTests[A] extends PartialOrderTests[A] {
4852
def laws: UpperBoundedLaws[A]
4953

50-
def upperBounded(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
54+
def upperBounded(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
5155
new DefaultRuleSet(
5256
"upperBounded",
5357
Some(partialOrder),
5458
"bound is greater than or equals" -> forAll(laws.boundGteqv _)
5559
)
60+
61+
@deprecated("use `upperBounded` without `Eq` parameters", "2.12.1")
62+
def upperBounded(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
63+
upperBounded(arbA, arbF)
5664
}
5765

5866
object UpperBoundedTests {

kernel-laws/shared/src/main/scala/cats/kernel/laws/discipline/EnumerableTests.scala

+17-8
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,41 @@ trait PartialNextTests[A] extends PartialOrderTests[A] {
3232

3333
def laws: PartialNextLaws[A]
3434

35-
def partialNext(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
35+
def partialNext(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
3636
new DefaultRuleSet(
3737
"partialNext",
3838
Some(partialOrder),
3939
"next(a) > a" -> forAll(laws.nextOrderWeak _),
4040
"forall a, b. if a < b. next(a) <= b" -> forAll(laws.nextOrderStrong _)
4141
)
4242

43+
@deprecated("use `partialNext` without `Eq` parameters", "2.12.1")
44+
def partialNext(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
45+
partialNext(arbA, arbF)
4346
}
4447

4548
trait PartialPreviousTests[A] extends PartialOrderTests[A] {
4649

4750
def laws: PartialPreviousLaws[A]
4851

49-
def partialPrevious(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
52+
def partialPrevious(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
5053
new DefaultRuleSet(
5154
"partialPrevious",
5255
Some(partialOrder),
5356
"next(a) > a" -> forAll(laws.previousOrderWeak _),
5457
"forall a, b. if a < b. next(a) <= b" -> forAll(laws.previousOrderStrong _)
5558
)
5659

60+
@deprecated("use `partialPrevious` without `Eq` parameters", "2.12.1")
61+
def partialPrevious(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
62+
partialPrevious(arbA, arbF)
5763
}
5864

5965
trait BoundedEnumerableTests[A] extends OrderTests[A] with PartialNextTests[A] with PartialPreviousTests[A] {
6066

6167
def laws: BoundedEnumerableLaws[A]
6268

63-
def boundedEnumerable(implicit
64-
arbA: Arbitrary[A],
65-
arbF: Arbitrary[A => A],
66-
eqOA: Eq[Option[A]],
67-
eqA: Eq[A]
68-
): RuleSet =
69+
def boundedEnumerable(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]]): RuleSet =
6970
new RuleSet {
7071
val name: String = "boundedEnumerable"
7172
val bases: Seq[(String, RuleSet)] = Nil
@@ -78,6 +79,14 @@ trait BoundedEnumerableTests[A] extends OrderTests[A] with PartialNextTests[A] w
7879
)
7980
}
8081

82+
@deprecated("use `boundedEnumerable` without `Eq[A]` parameter", "2.12.1")
83+
def boundedEnumerable(
84+
arbA: Arbitrary[A],
85+
arbF: Arbitrary[A => A],
86+
eqOA: Eq[Option[A]],
87+
eqA: Eq[A]
88+
): RuleSet =
89+
boundedEnumerable(arbA, arbF, eqOA)
8190
}
8291

8392
object BoundedEnumerableTests {

kernel-laws/shared/src/main/scala/cats/kernel/laws/discipline/HashTests.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ trait HashTests[A] extends EqTests[A] {
3434

3535
def laws: HashLaws[A]
3636

37-
def hash(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqA: Eq[A], hashA: Hashing[A]): RuleSet =
37+
def hash(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
3838
new DefaultRuleSet(
3939
"hash",
4040
Some(eqv),
4141
"hash compatibility" -> forAll(laws.hashCompatibility _)
4242
)
4343

44+
@deprecated("use `hash` without `Hashing` parameter", "2.12.1")
45+
def hash(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqA: Eq[A], hashA: Hashing[A]): RuleSet =
46+
hash(arbA, arbF)
4447
}
4548

4649
object HashTests {

kernel-laws/shared/src/main/scala/cats/kernel/laws/discipline/MonoidTests.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ package discipline
2626

2727
import cats.kernel.instances.boolean._
2828
import org.scalacheck.Arbitrary
29+
import org.scalacheck.Prop
2930
import org.scalacheck.Prop.forAll
3031

3132
trait MonoidTests[A] extends SemigroupTests[A] {
@@ -39,7 +40,7 @@ trait MonoidTests[A] extends SemigroupTests[A] {
3940
"left identity" -> forAll(laws.leftIdentity _),
4041
"right identity" -> forAll(laws.rightIdentity _),
4142
"combine all" -> forAll(laws.combineAll _),
42-
"collect0" -> forAll(laws.collect0 _),
43+
"collect0" -> (laws.collect0: Prop),
4344
"is id" -> forAll((a: A) => laws.isId(a, eqA)),
4445
"repeat0" -> forAll(laws.repeat0 _)
4546
)

kernel-laws/shared/src/main/scala/cats/kernel/laws/discipline/OrderTests.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trait OrderTests[A] extends PartialOrderTests[A] {
3232

3333
def laws: OrderLaws[A]
3434

35-
def order(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
35+
def order(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
3636
new DefaultRuleSet(
3737
"order",
3838
Some(partialOrder),
@@ -42,6 +42,9 @@ trait OrderTests[A] extends PartialOrderTests[A] {
4242
"min" -> forAll(laws.min _)
4343
)
4444

45+
@deprecated("use `order` without `Eq` parameters", "2.12.1")
46+
def order(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
47+
order(arbA, arbF)
4548
}
4649

4750
object OrderTests {

kernel-laws/shared/src/main/scala/cats/kernel/laws/discipline/PartialOrderTests.scala

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trait PartialOrderTests[A] extends EqTests[A] {
3232

3333
def laws: PartialOrderLaws[A]
3434

35-
def partialOrder(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
35+
def partialOrder(implicit arbA: Arbitrary[A], arbF: Arbitrary[A => A]): RuleSet =
3636
new DefaultRuleSet(
3737
"partialOrder",
3838
Some(eqv),
@@ -48,6 +48,9 @@ trait PartialOrderTests[A] extends EqTests[A] {
4848
"pmin" -> forAll(laws.pmin _)
4949
)
5050

51+
@deprecated("use `partialOrder` without `Eq` parameters", "2.12.1")
52+
def partialOrder(arbA: Arbitrary[A], arbF: Arbitrary[A => A], eqOA: Eq[Option[A]], eqA: Eq[A]): RuleSet =
53+
partialOrder(arbA, arbF)
5154
}
5255

5356
object PartialOrderTests {

0 commit comments

Comments
 (0)