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

Jump to bottom

Move appropriate SortedSet and SortedMap instances to kernel #3001

Merged
merged 3 commits into from
Aug 23, 2019
Merged

Move appropriate SortedSet and SortedMap instances to kernel #3001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5dfe67
Move appropriate SortedSet and SortedMap instances to kernel
travisbrown Aug 22, 2019
a3565cf
Merge branch 'master' into topic/sorted-x-instances
travisbrown Aug 23, 2019
a7713e8
Make new prioritization traits package-private
travisbrown Aug 23, 2019
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
Prev Previous commit
Next Next commit
Merge branch 'master' into topic/sorted-x-instances
  • Loading branch information
@travisbrown
travisbrown committed Aug 23, 2019
commit a3565cf81c2fc96c48251e1b233810ce7fce4f5c
4 changes: 2 additions & 2 deletions core/src/main/scala-2.12-/cats/instances/all.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ private[cats] trait AllInstancesBinCompat3 extends AllCoreDurationInstances

private[cats] trait AllInstancesBinCompat4 extends SortedMapInstancesBinCompat1 with MapInstancesBinCompat1

trait AllInstancesBinCompat5 extends SortedSetInstancesBinCompat0
private[cats] trait AllInstancesBinCompat5 extends SortedSetInstancesBinCompat0

trait AllInstancesBinCompat6 extends SortedSetInstancesBinCompat1 with SortedMapInstancesBinCompat2
private[cats] trait AllInstancesBinCompat6 extends SortedSetInstancesBinCompat1 with SortedMapInstancesBinCompat2
4 changes: 2 additions & 2 deletions core/src/main/scala-2.13+/cats/instances/all.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ private[cats] trait AllInstancesBinCompat3 extends AllCoreDurationInstances

private[cats] trait AllInstancesBinCompat4 extends SortedMapInstancesBinCompat1 with MapInstancesBinCompat1

trait AllInstancesBinCompat5 extends SortedSetInstancesBinCompat0
private[cats] trait AllInstancesBinCompat5 extends SortedSetInstancesBinCompat0

trait AllInstancesBinCompat6 extends SortedSetInstancesBinCompat1 with SortedMapInstancesBinCompat2
private[cats] trait AllInstancesBinCompat6 extends SortedSetInstancesBinCompat1 with SortedMapInstancesBinCompat2
8 changes: 4 additions & 4 deletions core/src/main/scala/cats/instances/sortedMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ trait SortedMapInstances extends SortedMapInstances2 {

}

trait SortedMapInstances1 {
private[instances] trait SortedMapInstances1 {
@deprecated("2.0.0-RC2", "Use cats.kernel.instances.sortedMap.catsKernelStdEqForSortedMap")
private[instances] def catsStdEqForSortedMap[K: Order, V: Eq]: Eq[SortedMap[K, V]] =
new SortedMapEq[K, V]
}

trait SortedMapInstances2 extends SortedMapInstances1 {
private[instances] trait SortedMapInstances2 extends SortedMapInstances1 {
@deprecated("2.0.0-RC2", "Use cats.kernel.instances.sortedMap.catsKernelStdMonoidForSortedMap")
private[instances] def catsStdMonoidForSortedMap[K: Order, V: Semigroup]: Monoid[SortedMap[K, V]] =
new SortedMapMonoid[K, V]
Expand Down Expand Up @@ -147,7 +147,7 @@ class SortedMapCommutativeMonoid[K, V](implicit V: CommutativeSemigroup[V], O: O
@deprecated("2.0.0-RC2", "Use cats.kernel.instances.SortedMapMonoid")
class SortedMapMonoid[K, V](implicit V: Semigroup[V], O: Order[K]) extends cats.kernel.instances.SortedMapMonoid[K, V]

trait SortedMapInstancesBinCompat0 {
private[instances] trait SortedMapInstancesBinCompat0 {
implicit def catsStdTraverseFilterForSortedMap[K: Order]: TraverseFilter[SortedMap[K, *]] =
new TraverseFilter[SortedMap[K, *]] {

Expand Down Expand Up @@ -195,4 +195,4 @@ private[instances] trait SortedMapInstancesBinCompat1 {
}
}

trait SortedMapInstancesBinCompat2 extends cats.kernel.instances.SortedMapInstances
private[instances] trait SortedMapInstancesBinCompat2 extends cats.kernel.instances.SortedMapInstances
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/instances/sortedSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ trait SortedSetInstances extends SortedSetInstances1 {
cats.kernel.instances.sortedSet.catsKernelStdOrderForSortedSet[A]
}

trait SortedSetInstances1 {
private[instances] trait SortedSetInstances1 {
@deprecated("2.0.0-RC2", "Use cats.kernel.instances.sortedSet.catsKernelStdHashForSortedSet")
private[instances] def catsKernelStdHashForSortedSet[A: Order: Hash]: Hash[SortedSet[A]] =
cats.kernel.instances.sortedSet.catsKernelStdHashForSortedSet[A]
Expand All @@ -91,7 +91,7 @@ private[instances] trait SortedSetInstancesBinCompat0 {
}
}

trait SortedSetInstancesBinCompat1 extends LowPrioritySortedSetInstancesBinCompat1 {
private[instances] trait SortedSetInstancesBinCompat1 extends LowPrioritySortedSetInstancesBinCompat1 {
// TODO: Remove when this is no longer necessary for binary compatibility.
implicit override def catsKernelStdHashForSortedSet[A: Order: Hash]: Hash[SortedSet[A]] =
cats.kernel.instances.sortedSet.catsKernelStdHashForSortedSet[A]
Expand Down
4 changes: 2 additions & 2 deletions kernel/src/main/scala-2.12-/cats/kernel/instances/AllInstances.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ trait AllInstances
with UUIDInstances
with VectorInstances

trait AllInstancesBinCompat0 extends FiniteDurationInstances
private[instances] trait AllInstancesBinCompat0 extends FiniteDurationInstances

trait AllInstancesBinCompat1 extends SortedMapInstances with SortedSetInstances
private[instances] trait AllInstancesBinCompat1 extends SortedMapInstances with SortedSetInstances
4 changes: 2 additions & 2 deletions kernel/src/main/scala-2.13+/cats/kernel/instances/AllInstances.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ trait AllInstances
with UUIDInstances
with VectorInstances

trait AllInstancesBinCompat0 extends FiniteDurationInstances
private[instances] trait AllInstancesBinCompat0 extends FiniteDurationInstances

trait AllInstancesBinCompat1 extends SortedMapInstances with SortedSetInstances
private[instances] trait AllInstancesBinCompat1 extends SortedMapInstances with SortedSetInstances
You are viewing a condensed version of this merge commit. You can view the full changes here.