From 7195f61d64a5d231f5b10b8e53c5d2da53c55c00 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 30 Sep 2019 23:30:17 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 2.1.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 303be4032f..5fd2f83ac5 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=2.0.1 +version=2.1.0 align.openParenCallSite = true align.openParenDefnSite = true maxColumn = 120 From 9a24a377ef60b5e4aebcdda1598adc775b96e851 Mon Sep 17 00:00:00 2001 From: "Frank S. Thomas" Date: Mon, 30 Sep 2019 23:42:56 +0200 Subject: [PATCH 2/2] fmt --- core/src/main/scala/cats/data/NonEmptyList.scala | 6 ++++-- core/src/main/scala/cats/data/NonEmptyVector.scala | 6 ++++-- core/src/main/scala/cats/instances/option.scala | 7 +++++-- laws/src/main/scala/cats/laws/discipline/MiniInt.scala | 10 +++++----- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/core/src/main/scala/cats/data/NonEmptyList.scala b/core/src/main/scala/cats/data/NonEmptyList.scala index 2e09836c65..43fb0c7390 100644 --- a/core/src/main/scala/cats/data/NonEmptyList.scala +++ b/core/src/main/scala/cats/data/NonEmptyList.scala @@ -511,8 +511,10 @@ sealed abstract private[data] class NonEmptyListInstances extends NonEmptyListIn implicit val catsDataInstancesForNonEmptyList : SemigroupK[NonEmptyList] with Bimonad[NonEmptyList] with NonEmptyTraverse[NonEmptyList] = - new NonEmptyReducible[NonEmptyList, List] with SemigroupK[NonEmptyList] with Bimonad[NonEmptyList] - with NonEmptyTraverse[NonEmptyList] { + new NonEmptyReducible[NonEmptyList, List] + with SemigroupK[NonEmptyList] + with Bimonad[NonEmptyList] + with NonEmptyTraverse[NonEmptyList] { def combineK[A](a: NonEmptyList[A], b: NonEmptyList[A]): NonEmptyList[A] = a.concatNel(b) diff --git a/core/src/main/scala/cats/data/NonEmptyVector.scala b/core/src/main/scala/cats/data/NonEmptyVector.scala index 1121668b0f..606d477ec4 100644 --- a/core/src/main/scala/cats/data/NonEmptyVector.scala +++ b/core/src/main/scala/cats/data/NonEmptyVector.scala @@ -240,8 +240,10 @@ sealed abstract private[data] class NonEmptyVectorInstances { implicit val catsDataInstancesForNonEmptyVector : SemigroupK[NonEmptyVector] with Bimonad[NonEmptyVector] with NonEmptyTraverse[NonEmptyVector] = - new NonEmptyReducible[NonEmptyVector, Vector] with SemigroupK[NonEmptyVector] with Bimonad[NonEmptyVector] - with NonEmptyTraverse[NonEmptyVector] { + new NonEmptyReducible[NonEmptyVector, Vector] + with SemigroupK[NonEmptyVector] + with Bimonad[NonEmptyVector] + with NonEmptyTraverse[NonEmptyVector] { def combineK[A](a: NonEmptyVector[A], b: NonEmptyVector[A]): NonEmptyVector[A] = a.concatNev(b) diff --git a/core/src/main/scala/cats/instances/option.scala b/core/src/main/scala/cats/instances/option.scala index 5c2ae4b8f0..2de68b1ed0 100644 --- a/core/src/main/scala/cats/instances/option.scala +++ b/core/src/main/scala/cats/instances/option.scala @@ -10,8 +10,11 @@ trait OptionInstances extends cats.kernel.instances.OptionInstances { with Alternative[Option] with CommutativeMonad[Option] with CoflatMap[Option] = - new Traverse[Option] with MonadError[Option, Unit] with Alternative[Option] with CommutativeMonad[Option] - with CoflatMap[Option] { + new Traverse[Option] + with MonadError[Option, Unit] + with Alternative[Option] + with CommutativeMonad[Option] + with CoflatMap[Option] { def empty[A]: Option[A] = None diff --git a/laws/src/main/scala/cats/laws/discipline/MiniInt.scala b/laws/src/main/scala/cats/laws/discipline/MiniInt.scala index 0adf97838d..2958124c70 100644 --- a/laws/src/main/scala/cats/laws/discipline/MiniInt.scala +++ b/laws/src/main/scala/cats/laws/discipline/MiniInt.scala @@ -51,12 +51,12 @@ object MiniInt { val allValues: List[MiniInt] = (minIntValue to maxIntValue).map(unsafeFromInt).toList - implicit val catsLawsEqInstancesForMiniInt: Order[MiniInt] with Hash[MiniInt] = new Order[MiniInt] - with Hash[MiniInt] { - def hash(x: MiniInt): Int = Hash[Int].hash(x.intBits) + implicit val catsLawsEqInstancesForMiniInt: Order[MiniInt] with Hash[MiniInt] = + new Order[MiniInt] with Hash[MiniInt] { + def hash(x: MiniInt): Int = Hash[Int].hash(x.intBits) - def compare(x: MiniInt, y: MiniInt): Int = Order[Int].compare(x.toInt, y.toInt) - } + def compare(x: MiniInt, y: MiniInt): Int = Order[Int].compare(x.toInt, y.toInt) + } implicit val catsLawsExhaustiveCheckForMiniInt: ExhaustiveCheck[MiniInt] = ExhaustiveCheck.instance(allValues)