diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 80cc5536..12ad3dba 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -9,3 +9,6 @@ # Scala Steward: Reformat with scalafmt 3.7.5 227768882464e0846c22da2031211c579dbcca10 + +# Scala Steward: Reformat with scalafmt 3.8.2 +32114d9e9e6fc91aab23e6042e46157c4a5253af diff --git a/.scalafmt.conf b/.scalafmt.conf index 3726b2b1..fbc16805 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.1" +version = "3.8.2" style = default maxColumn = 100 diff --git a/core/shared/src/main/scala-2.11/scala/collection/compat/CompatImpl.scala b/core/shared/src/main/scala-2.11/scala/collection/compat/CompatImpl.scala index ec8f36d1..a2a70e22 100644 --- a/core/shared/src/main/scala-2.11/scala/collection/compat/CompatImpl.scala +++ b/core/shared/src/main/scala-2.11/scala/collection/compat/CompatImpl.scala @@ -64,7 +64,7 @@ private[compat] object CompatImpl { def simpleCBF[A, C](f: => m.Builder[A, C]): CanBuildFrom[Any, A, C] = new CanBuildFrom[Any, A, C] { def apply(from: Any): m.Builder[A, C] = apply() - def apply(): m.Builder[A, C] = f + def apply(): m.Builder[A, C] = f } type ImmutableBitSetCC[X] = ({ type L[_] = i.BitSet })#L[X] diff --git a/core/shared/src/main/scala-2.11/scala/collection/compat/PackageShared.scala b/core/shared/src/main/scala-2.11/scala/collection/compat/PackageShared.scala index e3c9a59f..4463a147 100644 --- a/core/shared/src/main/scala-2.11/scala/collection/compat/PackageShared.scala +++ b/core/shared/src/main/scala-2.11/scala/collection/compat/PackageShared.scala @@ -263,7 +263,7 @@ class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T } class IteratorExtensionMethods[A](private val self: c.Iterator[A]) extends AnyVal { - def sameElements[B >: A](that: c.TraversableOnce[B]): Boolean = + def sameElements[B >: A](that: c.TraversableOnce[B]): Boolean = self.sameElements(that.iterator) def concat[B >: A](that: c.TraversableOnce[B]): c.TraversableOnce[B] = self ++ that def tapEach[U](f: A => U): c.Iterator[A] = self.map { a => f(a); a } @@ -300,9 +300,9 @@ class TraversableOnceExtensionMethods[A](private val self: c.TraversableOnce[A]) class TraversableExtensionMethods[A](private val self: c.Traversable[A]) extends AnyVal { def iterableFactory: GenericCompanion[Traversable] = self.companion - def sizeCompare(otherSize: Int): Int = SizeCompareImpl.sizeCompareInt(self)(otherSize) - def sizeIs: SizeCompareOps = new SizeCompareOps(self) - def sizeCompare(that: c.Traversable[_]): Int = SizeCompareImpl.sizeCompareColl(self)(that) + def sizeCompare(otherSize: Int): Int = SizeCompareImpl.sizeCompareInt(self)(otherSize) + def sizeIs: SizeCompareOps = new SizeCompareOps(self) + def sizeCompare(that: c.Traversable[_]): Int = SizeCompareImpl.sizeCompareColl(self)(that) } diff --git a/core/shared/src/main/scala-2.11/scala/collection/compat/package.scala b/core/shared/src/main/scala-2.11/scala/collection/compat/package.scala index ca441fe5..299755b0 100644 --- a/core/shared/src/main/scala-2.11/scala/collection/compat/package.scala +++ b/core/shared/src/main/scala-2.11/scala/collection/compat/package.scala @@ -33,7 +33,7 @@ package object compat extends compat.PackageShared { // `CanBuildFrom` parameters are used as type constraints, they are not used // at run-time, hence the dummy builder implementations def apply(from: IterableView[(K, V), CC[K, V]]) = new TraversableView.NoBuilder - def apply() = new TraversableView.NoBuilder + def apply() = new TraversableView.NoBuilder } implicit def toTraversableLikeExtensionMethods[Repr](self: Repr)(implicit diff --git a/core/shared/src/main/scala-2.12/scala/collection/compat/CompatImpl.scala b/core/shared/src/main/scala-2.12/scala/collection/compat/CompatImpl.scala index ec8f36d1..a2a70e22 100644 --- a/core/shared/src/main/scala-2.12/scala/collection/compat/CompatImpl.scala +++ b/core/shared/src/main/scala-2.12/scala/collection/compat/CompatImpl.scala @@ -64,7 +64,7 @@ private[compat] object CompatImpl { def simpleCBF[A, C](f: => m.Builder[A, C]): CanBuildFrom[Any, A, C] = new CanBuildFrom[Any, A, C] { def apply(from: Any): m.Builder[A, C] = apply() - def apply(): m.Builder[A, C] = f + def apply(): m.Builder[A, C] = f } type ImmutableBitSetCC[X] = ({ type L[_] = i.BitSet })#L[X] diff --git a/core/shared/src/main/scala-2.12/scala/collection/compat/PackageShared.scala b/core/shared/src/main/scala-2.12/scala/collection/compat/PackageShared.scala index e3c9a59f..4463a147 100644 --- a/core/shared/src/main/scala-2.12/scala/collection/compat/PackageShared.scala +++ b/core/shared/src/main/scala-2.12/scala/collection/compat/PackageShared.scala @@ -263,7 +263,7 @@ class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T } class IteratorExtensionMethods[A](private val self: c.Iterator[A]) extends AnyVal { - def sameElements[B >: A](that: c.TraversableOnce[B]): Boolean = + def sameElements[B >: A](that: c.TraversableOnce[B]): Boolean = self.sameElements(that.iterator) def concat[B >: A](that: c.TraversableOnce[B]): c.TraversableOnce[B] = self ++ that def tapEach[U](f: A => U): c.Iterator[A] = self.map { a => f(a); a } @@ -300,9 +300,9 @@ class TraversableOnceExtensionMethods[A](private val self: c.TraversableOnce[A]) class TraversableExtensionMethods[A](private val self: c.Traversable[A]) extends AnyVal { def iterableFactory: GenericCompanion[Traversable] = self.companion - def sizeCompare(otherSize: Int): Int = SizeCompareImpl.sizeCompareInt(self)(otherSize) - def sizeIs: SizeCompareOps = new SizeCompareOps(self) - def sizeCompare(that: c.Traversable[_]): Int = SizeCompareImpl.sizeCompareColl(self)(that) + def sizeCompare(otherSize: Int): Int = SizeCompareImpl.sizeCompareInt(self)(otherSize) + def sizeIs: SizeCompareOps = new SizeCompareOps(self) + def sizeCompare(that: c.Traversable[_]): Int = SizeCompareImpl.sizeCompareColl(self)(that) } diff --git a/core/shared/src/main/scala-2.12/scala/collection/compat/package.scala b/core/shared/src/main/scala-2.12/scala/collection/compat/package.scala index d2418f5b..8f0e7955 100644 --- a/core/shared/src/main/scala-2.12/scala/collection/compat/package.scala +++ b/core/shared/src/main/scala-2.12/scala/collection/compat/package.scala @@ -42,7 +42,7 @@ package object compat extends compat.PackageShared { // `CanBuildFrom` parameters are used as type constraints, they are not used // at run-time, hence the dummy builder implementations def apply(from: IterableView[(K, V), CC[K, V]]) = new TraversableView.NoBuilder - def apply() = new TraversableView.NoBuilder + def apply() = new TraversableView.NoBuilder } implicit def toTraversableLikeExtensionMethods[Repr](self: Repr)(implicit diff --git a/core/shared/src/main/scala/java/text/NumberFormat.scala b/core/shared/src/main/scala/java/text/NumberFormat.scala index 08ebd28b..dab8c28e 100644 --- a/core/shared/src/main/scala/java/text/NumberFormat.scala +++ b/core/shared/src/main/scala/java/text/NumberFormat.scala @@ -32,7 +32,7 @@ abstract class NumberFormat protected () extends Format { // def parse(source: String, parsePosition: ParsePosition): Number // def parse(source: String): Number - def isParseIntegerOnly(): Boolean = this.parseIntegerOnly + def isParseIntegerOnly(): Boolean = this.parseIntegerOnly def setParseIntegerOnly(value: Boolean): Unit = this.parseIntegerOnly = value def isGroupingUsed(): Boolean @@ -53,7 +53,7 @@ abstract class NumberFormat protected () extends Format { def getCurrency(): Currency def setCurrency(currency: Currency): Unit - def getRoundingMode(): RoundingMode = roundingMode + def getRoundingMode(): RoundingMode = roundingMode def setRoundingMode(mode: RoundingMode): Unit = this.roundingMode = mode }