Skip to content

Commit

Permalink
Merge pull request #496 from scala-steward/update/scalafmt-core-3.8.2
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.2
  • Loading branch information
mergify[bot] authored Jun 16, 2024
2 parents bff8760 + 1f729ad commit a055d4e
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@

# Scala Steward: Reformat with scalafmt 3.7.5
227768882464e0846c22da2031211c579dbcca10

# Scala Steward: Reformat with scalafmt 3.8.2
32114d9e9e6fc91aab23e6042e46157c4a5253af
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.1"
version = "3.8.2"
style = default

maxColumn = 100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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)

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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)

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/shared/src/main/scala/java/text/NumberFormat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

Expand Down

0 comments on commit a055d4e

Please sign in to comment.