Skip to content

Commit

Permalink
Reformat with scalafmt 3.7.2
Browse files Browse the repository at this point in the history 
Executed command: scalafmt --non-interactive
  • Loading branch information
@scala-steward
scala-steward committed Feb 23, 2023
1 parent da4da63 commit 25cfd2f
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 73 deletions.
74 changes: 37 additions & 37 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ThisBuild / githubWorkflowBuildPreamble +=
List("sudo apt-get install libutf8proc-dev"),
name = Some("Install libutf8proc")
)
ThisBuild / githubWorkflowPublish := Seq(
ThisBuild / githubWorkflowPublish := Seq(
WorkflowStep.Sbt(
List("ci-release"),
env = Map(
Expand Down Expand Up @@ -142,15 +142,15 @@ lazy val localesFullCurrenciesDb = project
.configure(_.enablePlugins(LocalesPlugin))
.configure(_.enablePlugins(ScalaJSPlugin))
.settings(
name := "locales-full-currencies-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.All,
nsFilter := NumberingSystemFilter.All,
calendarFilter := CalendarFilter.All,
currencyFilter := CurrencyFilter.All,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := true,
name := "locales-full-currencies-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.All,
nsFilter := NumberingSystemFilter.All,
calendarFilter := CalendarFilter.All,
currencyFilter := CurrencyFilter.All,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := true,
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
.cross(CrossVersion.for3Use2_13)
)
Expand All @@ -161,15 +161,15 @@ lazy val localesFullDb = crossProject(JSPlatform, NativePlatform)
.settings(commonSettings)
.configure(_.enablePlugins(LocalesPlugin))
.settings(
name := "locales-full-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.All,
nsFilter := NumberingSystemFilter.All,
calendarFilter := CalendarFilter.All,
currencyFilter := CurrencyFilter.None,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := true,
name := "locales-full-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.All,
nsFilter := NumberingSystemFilter.All,
calendarFilter := CalendarFilter.All,
currencyFilter := CurrencyFilter.None,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := true,
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
.cross(CrossVersion.for3Use2_13)
)
Expand All @@ -179,15 +179,15 @@ lazy val localesMinimalEnDb = crossProject(JSPlatform, NativePlatform)
.settings(commonSettings)
.configure(_.enablePlugins(LocalesPlugin))
.settings(
name := "locales-minimal-en-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.Minimal,
nsFilter := NumberingSystemFilter.Minimal,
calendarFilter := CalendarFilter.Minimal,
currencyFilter := CurrencyFilter.None,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := false,
name := "locales-minimal-en-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.Minimal,
nsFilter := NumberingSystemFilter.Minimal,
calendarFilter := CalendarFilter.Minimal,
currencyFilter := CurrencyFilter.None,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := false,
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
.cross(CrossVersion.for3Use2_13)
)
Expand All @@ -197,15 +197,15 @@ lazy val localesMinimalEnUSDb = crossProject(JSPlatform, NativePlatform)
.settings(commonSettings)
.configure(_.enablePlugins(LocalesPlugin))
.settings(
name := "locales-minimal-en_US-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.Selection(List("en_US")),
nsFilter := NumberingSystemFilter.Minimal,
calendarFilter := CalendarFilter.Minimal,
currencyFilter := CurrencyFilter.None,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := false,
name := "locales-minimal-en_US-db",
cldrVersion := CLDRVersion.Version(cldrDbVersion),
localesFilter := LocalesFilter.Selection(List("en_US")),
nsFilter := NumberingSystemFilter.Minimal,
calendarFilter := CalendarFilter.Minimal,
currencyFilter := CurrencyFilter.None,
supportDateTimeFormats := true,
supportNumberFormats := true,
supportISOCodes := false,
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
.cross(CrossVersion.for3Use2_13)
)
Expand Down
4 changes: 2 additions & 2 deletions core/shared/src/main/scala-2.11/scala/collection/compat/CompatImpl.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import scala.collection.{ immutable => i, mutable => m }
* and defers to the underlying builder if not.
*/
private final class IdentityPreservingBuilder[A, CC[X] <: TraversableOnce[X]](
that: m.Builder[A, CC[A]]
that: m.Builder[A, CC[A]]
)(implicit ct: ClassTag[CC[A]])
extends m.Builder[A, CC[A]] {

Expand Down 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
24 changes: 12 additions & 12 deletions core/shared/src/main/scala-2.11/scala/collection/compat/PackageShared.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,16 @@ class StreamExtensionMethods[A](private val stream: Stream[A]) extends AnyVal {
}

class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T]) {
def rangeFrom(from: K): T = fact.from(from)
def rangeTo(to: K): T = fact.to(to)
def rangeFrom(from: K): T = fact.from(from)
def rangeTo(to: K): T = fact.to(to)
def rangeUntil(until: K): T = fact.until(until)
}

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 }
def tapEach[U](f: A => U): c.Iterator[A] = self.map { a => f(a); a }
}

class TraversableOnceExtensionMethods[A](private val self: c.TraversableOnce[A]) extends AnyVal {
Expand Down Expand Up @@ -300,8 +300,8 @@ 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(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 Expand Up @@ -378,8 +378,8 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl
self.map { a => f(a); a }

def partitionMap[A1, A2, That, Repr1, Repr2](f: A => Either[A1, A2])(implicit
bf1: CanBuildFrom[Repr, A1, Repr1],
bf2: CanBuildFrom[Repr, A2, Repr2]
bf1: CanBuildFrom[Repr, A1, Repr1],
bf2: CanBuildFrom[Repr, A2, Repr2]
): (Repr1, Repr2) = {
val l = bf1()
val r = bf2()
Expand All @@ -394,7 +394,7 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl

def groupMap[K, B, That](
key: A => K
)(f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): Map[K, That] = {
)(f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): Map[K, That] = {
val map = m.Map.empty[K, m.Builder[B, That]]
for (elem <- self) {
val k = key(elem)
Expand Down Expand Up @@ -425,7 +425,7 @@ class TrulyTraversableLikeExtensionMethods[El1, Repr1](
) extends AnyVal {

def lazyZip[El2, Repr2, T2](t2: T2)(implicit
w2: T2 => IterableLike[El2, Repr2]
w2: T2 => IterableLike[El2, Repr2]
): Tuple2Zipped[El1, Repr1, El2, Repr2] = new Tuple2Zipped((self, t2))
}

Expand All @@ -434,7 +434,7 @@ class Tuple2ZippedExtensionMethods[El1, Repr1, El2, Repr2](
) {

def lazyZip[El3, Repr3, T3](t3: T3)(implicit
w3: T3 => IterableLike[El3, Repr3]
w3: T3 => IterableLike[El3, Repr3]
): Tuple3Zipped[El1, Repr1, El2, Repr2, El3, Repr3] =
new Tuple3Zipped((self.colls._1, self.colls._2, t3))
}
Expand All @@ -451,7 +451,7 @@ class MapViewExtensionMethods[K, V, C <: scala.collection.Map[K, V]](
) extends AnyVal {

def mapValues[W, That](f: V => W)(implicit
bf: CanBuildFrom[IterableView[(K, V), C], (K, W), That]
bf: CanBuildFrom[IterableView[(K, V), C], (K, W), That]
): That =
self.map[(K, W), That] { case (k, v) => (k, f(v)) }

Expand Down
8 changes: 4 additions & 4 deletions core/shared/src/main/scala-2.11/scala/collection/compat/package.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import scala.{ collection => c }

package object compat extends compat.PackageShared {
implicit def genericOrderedCompanionToCBF[A, CC[X] <: Traversable[X]](
fact: GenericOrderedCompanion[CC]
fact: GenericOrderedCompanion[CC]
)(implicit ordering: Ordering[A]): CanBuildFrom[Any, A, CC[A]] =
CompatImpl.simpleCBF(fact.newBuilder[A])

Expand All @@ -33,19 +33,19 @@ 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
traversable: IsTraversableLike[Repr]
traversable: IsTraversableLike[Repr]
): TraversableLikeExtensionMethods[traversable.A, Repr] =
new TraversableLikeExtensionMethods[traversable.A, Repr](traversable.conversion(self))

implicit def toSeqExtensionMethods[A](self: c.Seq[A]): SeqExtensionMethods[A] =
new SeqExtensionMethods[A](self)

implicit def toTrulyTraversableLikeExtensionMethods[T1, El1, Repr1](self: T1)(implicit
w1: T1 => TraversableLike[El1, Repr1]
w1: T1 => TraversableLike[El1, Repr1]
): TrulyTraversableLikeExtensionMethods[El1, Repr1] =
new TrulyTraversableLikeExtensionMethods[El1, Repr1](w1(self))

Expand Down
4 changes: 2 additions & 2 deletions core/shared/src/main/scala-2.12/scala/collection/compat/CompatImpl.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import scala.collection.{ immutable => i, mutable => m }
* and defers to the underlying builder if not.
*/
private final class IdentityPreservingBuilder[A, CC[X] <: TraversableOnce[X]](
that: m.Builder[A, CC[A]]
that: m.Builder[A, CC[A]]
)(implicit ct: ClassTag[CC[A]])
extends m.Builder[A, CC[A]] {

Expand Down 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
24 changes: 12 additions & 12 deletions core/shared/src/main/scala-2.12/scala/collection/compat/PackageShared.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,16 @@ class StreamExtensionMethods[A](private val stream: Stream[A]) extends AnyVal {
}

class SortedExtensionMethods[K, T <: Sorted[K, T]](private val fact: Sorted[K, T]) {
def rangeFrom(from: K): T = fact.from(from)
def rangeTo(to: K): T = fact.to(to)
def rangeFrom(from: K): T = fact.from(from)
def rangeTo(to: K): T = fact.to(to)
def rangeUntil(until: K): T = fact.until(until)
}

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 }
def tapEach[U](f: A => U): c.Iterator[A] = self.map { a => f(a); a }
}

class TraversableOnceExtensionMethods[A](private val self: c.TraversableOnce[A]) extends AnyVal {
Expand Down Expand Up @@ -300,8 +300,8 @@ 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(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 Expand Up @@ -378,8 +378,8 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl
self.map { a => f(a); a }

def partitionMap[A1, A2, That, Repr1, Repr2](f: A => Either[A1, A2])(implicit
bf1: CanBuildFrom[Repr, A1, Repr1],
bf2: CanBuildFrom[Repr, A2, Repr2]
bf1: CanBuildFrom[Repr, A1, Repr1],
bf2: CanBuildFrom[Repr, A2, Repr2]
): (Repr1, Repr2) = {
val l = bf1()
val r = bf2()
Expand All @@ -394,7 +394,7 @@ class TraversableLikeExtensionMethods[A, Repr](private val self: c.GenTraversabl

def groupMap[K, B, That](
key: A => K
)(f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): Map[K, That] = {
)(f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): Map[K, That] = {
val map = m.Map.empty[K, m.Builder[B, That]]
for (elem <- self) {
val k = key(elem)
Expand Down Expand Up @@ -425,7 +425,7 @@ class TrulyTraversableLikeExtensionMethods[El1, Repr1](
) extends AnyVal {

def lazyZip[El2, Repr2, T2](t2: T2)(implicit
w2: T2 => IterableLike[El2, Repr2]
w2: T2 => IterableLike[El2, Repr2]
): Tuple2Zipped[El1, Repr1, El2, Repr2] = new Tuple2Zipped((self, t2))
}

Expand All @@ -434,7 +434,7 @@ class Tuple2ZippedExtensionMethods[El1, Repr1, El2, Repr2](
) {

def lazyZip[El3, Repr3, T3](t3: T3)(implicit
w3: T3 => IterableLike[El3, Repr3]
w3: T3 => IterableLike[El3, Repr3]
): Tuple3Zipped[El1, Repr1, El2, Repr2, El3, Repr3] =
new Tuple3Zipped((self.colls._1, self.colls._2, t3))
}
Expand All @@ -451,7 +451,7 @@ class MapViewExtensionMethods[K, V, C <: scala.collection.Map[K, V]](
) extends AnyVal {

def mapValues[W, That](f: V => W)(implicit
bf: CanBuildFrom[IterableView[(K, V), C], (K, W), That]
bf: CanBuildFrom[IterableView[(K, V), C], (K, W), That]
): That =
self.map[(K, W), That] { case (k, v) => (k, f(v)) }

Expand Down
8 changes: 4 additions & 4 deletions core/shared/src/main/scala-2.12/scala/collection/compat/package.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package object compat extends compat.PackageShared {
}

implicit def genericOrderedCompanionToCBF[A, CC[X] <: Traversable[X]](
fact: GenericOrderedCompanion[CC]
fact: GenericOrderedCompanion[CC]
)(implicit ordering: Ordering[A]): CanBuildFrom[Any, A, CC[A]] =
CompatImpl.simpleCBF(fact.newBuilder[A])

Expand All @@ -42,19 +42,19 @@ 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
traversable: IsTraversableLike[Repr]
traversable: IsTraversableLike[Repr]
): TraversableLikeExtensionMethods[traversable.A, Repr] =
new TraversableLikeExtensionMethods[traversable.A, Repr](traversable.conversion(self))

implicit def toSeqExtensionMethods[A](self: c.Seq[A]): SeqExtensionMethods[A] =
new SeqExtensionMethods[A](self)

implicit def toTrulyTraversableLikeExtensionMethods[T1, El1, Repr1](self: T1)(implicit
w1: T1 => TraversableLike[El1, Repr1]
w1: T1 => TraversableLike[El1, Repr1]
): TrulyTraversableLikeExtensionMethods[El1, Repr1] =
new TrulyTraversableLikeExtensionMethods[El1, Repr1](w1(self))

Expand Down

0 comments on commit 25cfd2f

Please sign in to comment.