From d82b447ead1ec62da557ca0530b49dd04c8d3103 Mon Sep 17 00:00:00 2001 From: Luka Jacobowitz Date: Thu, 5 Oct 2017 09:21:06 +0200 Subject: [PATCH] Rename to ascending order --- build.sbt | 4 +--- kernel/src/main/scala/cats/kernel/instances/option.scala | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index dd14fc784f3..fc0ac423259 100644 --- a/build.sbt +++ b/build.sbt @@ -347,13 +347,11 @@ val binaryCompatibleExceptions = { exclude[InheritedNewAbstractMethodProblem]("cats.kernel.instances.EitherInstances0.catsDataSemigroupForEither"), exclude[InheritedNewAbstractMethodProblem]("cats.kernel.instances.EitherInstances0.catsStdHashForEither"), exclude[InheritedNewAbstractMethodProblem]("cats.kernel.instances.EitherInstances0.catsStdPartialOrderForEither"), - exclude[ReversedMissingMethodProblem]("cats.kernel.instances.OptionInstances1.catsKernelStdHashForOption"), exclude[ReversedMissingMethodProblem]("cats.kernel.instances.FunctionInstances0.catsKernelHashForFunction0"), exclude[ReversedMissingMethodProblem]("cats.kernel.instances.EitherInstances0.catsStdHashForEither"), - exclude[DirectMissingMethodProblem]("cats.kernel.instances.OptionInstances1.catsKernelStdPartialOrderForOption"), exclude[DirectMissingMethodProblem]("cats.kernel.instances.all.package.catsKernelStdPartialOrderForBitSet"), exclude[DirectMissingMethodProblem]("cats.kernel.instances.bitSet.package.catsKernelStdPartialOrderForBitSet"), - //todo: remove these once we release 1.0.0-RC1 + exclude[MissingTypesProblem]("cats.kernel.instances.OptionInstances1"), exclude[InheritedNewAbstractMethodProblem]("cats.kernel.instances.QueueInstances.*"), exclude[InheritedNewAbstractMethodProblem]("cats.kernel.instances.QueueInstances1.*"), exclude[InheritedNewAbstractMethodProblem]("cats.kernel.instances.QueueInstances2.*"), diff --git a/kernel/src/main/scala/cats/kernel/instances/option.scala b/kernel/src/main/scala/cats/kernel/instances/option.scala index 3239b8db4ea..ab324dabd8d 100644 --- a/kernel/src/main/scala/cats/kernel/instances/option.scala +++ b/kernel/src/main/scala/cats/kernel/instances/option.scala @@ -3,24 +3,24 @@ package instances package object option extends OptionInstances -trait OptionInstances extends OptionInstances2 { +trait OptionInstances extends OptionInstances0 { implicit def catsKernelStdOrderForOption[A: Order]: Order[Option[A]] = new OptionOrder[A] implicit def catsKernelStdMonoidForOption[A: Semigroup]: Monoid[Option[A]] = new OptionMonoid[A] } -trait OptionInstances2 extends OptionInstances1 { +trait OptionInstances0 extends OptionInstances1 { implicit def catsKernelStdPartialOrderForOption[A: PartialOrder]: PartialOrder[Option[A]] = new OptionPartialOrder[A] } -trait OptionInstances1 extends OptionInstances0 { +trait OptionInstances1 extends OptionInstances2 { implicit def catsKernelStdHashForOption[A: Hash]: Hash[Option[A]] = new OptionHash[A] } -trait OptionInstances0 { +trait OptionInstances2 { implicit def catsKernelStdEqForOption[A: Eq]: Eq[Option[A]] = new OptionEq[A] }