Skip to content

Commit aa75b22

Browse files
satorgsatorg
authored
Merge pull request #1070 from xuwei-k/update-scalafmt
Update `.scalafmt.conf`. enforce new syntax
2 parents aaaad19 + 518122c commit aa75b22

40 files changed

+99
-97
lines changed

‎.scalafmt.conf

+2
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ fileOverride {
3232
project.excludeFilters = [
3333
"scalafix/*"
3434
]
35+
rewrite.scala3.convertToNewSyntax = true
36+
rewrite.scala3.newSyntax.control = false

‎bench/src/main/scala/org/scalacheck/bench/GenBench.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package org.scalacheck.bench
1111

1212
import java.util.concurrent.TimeUnit
13-
import org.openjdk.jmh.annotations._
13+
import org.openjdk.jmh.annotations.*
1414

1515
import org.scalacheck.Arbitrary.arbitrary
1616
import org.scalacheck.Gen

‎core/js/src/main/scala/org/scalacheck/Platform.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package org.scalacheck
1212
import scala.annotation.nowarn
1313
import scala.scalajs.reflect.Reflect
1414

15-
import Test._
15+
import Test.*
1616

1717
private[scalacheck] object Platform {
1818

@@ -35,13 +35,13 @@ private[scalacheck] object Platform {
3535
}
3636

3737
@nowarn("msg=is never used")
38-
def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[_]])(args: Seq[AnyRef]): AnyRef = {
38+
def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[?]])(args: Seq[AnyRef]): AnyRef = {
3939
Reflect
4040
.lookupInstantiatableClass(name)
4141
.getOrElse(throw new ClassNotFoundException(name))
42-
.getConstructor(paramTypes: _*)
42+
.getConstructor(paramTypes*)
4343
.getOrElse(throw new NoSuchMethodError(paramTypes.mkString("<init>(", ",", ")")))
44-
.newInstance(args: _*)
44+
.newInstance(args*)
4545
.asInstanceOf[AnyRef]
4646
}
4747

‎core/jvm/src/main/scala/org/scalacheck/Platform.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package org.scalacheck
1111

1212
import scala.annotation.nowarn
1313

14-
import Test._
14+
import Test.*
1515

1616
private[scalacheck] object Platform {
1717

@@ -22,7 +22,7 @@ private[scalacheck] object Platform {
2222
workerFun: Int => Result,
2323
stop: () => Unit
2424
): Result = {
25-
import params._
25+
import params.*
2626

2727
def mergeResults(r1: Result, r2: Result): Result = {
2828
val Result(st1, s1, d1, fm1, _) = r1
@@ -41,7 +41,7 @@ private[scalacheck] object Platform {
4141

4242
if (workers < 2) workerFun(0)
4343
else {
44-
import concurrent._
44+
import concurrent.*
4545
val tp = java.util.concurrent.Executors.newFixedThreadPool(workers)
4646
implicit val ec: ExecutionContextExecutor = ExecutionContext.fromExecutor(tp)
4747
try {
@@ -65,7 +65,7 @@ private[scalacheck] object Platform {
6565
}
6666

6767
@nowarn("msg=is never used")
68-
def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[_]])(args: Seq[AnyRef]): AnyRef =
68+
def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[?]])(args: Seq[AnyRef]): AnyRef =
6969
if (args.nonEmpty) ???
7070
else Class.forName(name, true, loader).getDeclaredConstructor().newInstance().asInstanceOf[AnyRef]
7171

‎core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ package org.scalacheck
1111

1212
import java.util.concurrent.TimeUnit
1313

14-
import Prop._
15-
import Arbitrary._
14+
import Prop.*
15+
import Arbitrary.*
1616

1717
object ArbitrarySpecification extends Properties("Arbitrary") {
1818
val genOptionUnits =

‎core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
package org.scalacheck
1111

12-
import java.time._
12+
import java.time.*
1313
import java.time.temporal.ChronoUnit
1414
import java.util.Date
1515
import scala.util.Failure
1616
import scala.util.Success
1717
import scala.util.Try
1818

19-
import Gen._
19+
import Gen.*
2020

2121
object ChooseSpecification extends Properties("Choose") with time.OrderingVersionSpecific {
2222

@@ -29,7 +29,7 @@ object ChooseSpecification extends Properties("Choose") with time.OrderingVersio
2929
import O.mkOrderingOps
3030
Try(choose(l, h)) match {
3131
case Success(g) => Prop.forAll(g) { x => l <= x && x <= h }
32-
case Failure(_: Choose.IllegalBoundsError[_]) => l > h
32+
case Failure(_: Choose.IllegalBoundsError[?]) => l > h
3333
case Failure(e) => throw e
3434
}
3535
}

‎core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import org.scalacheck.GenSpecification.arbSeed
1515
import org.scalacheck.Prop.forAll
1616
import org.scalacheck.rng.Seed
1717

18-
import java.time._
18+
import java.time.*
1919
import java.util.UUID
2020
import scala.collection.immutable.SortedMap
2121
import scala.collection.immutable.SortedSet
2222
import scala.concurrent.duration.Duration
2323
import scala.concurrent.duration.FiniteDuration
2424
import scala.util.Try
25-
import ScalaVersionSpecific._
25+
import ScalaVersionSpecific.*
2626

2727
object CogenSpecification extends Properties("Cogen") {
2828

‎core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import scala.util.Success
1414
import scala.util.Try
1515

1616
import rng.Seed
17-
import Gen._
17+
import Gen.*
1818
import Prop.{forAll, forAllNoShrink, someFailing, noneFailing, sizedProp, secure, propBoolean}
19-
import Arbitrary._
20-
import Shrink._
19+
import Arbitrary.*
20+
import Shrink.*
2121

2222
object GenSpecification extends Properties("Gen") with GenSpecificationVersionSpecific {
2323

@@ -56,7 +56,7 @@ object GenSpecification extends Properties("Gen") with GenSpecificationVersionSp
5656
}
5757

5858
property("frequency 3") = forAll(choose(1, 100000)) { n =>
59-
forAll(frequency(List.fill(n)((1, const(0))): _*)) { _ == 0 }
59+
forAll(frequency(List.fill(n)((1, const(0)))*)) { _ == 0 }
6060
}
6161

6262
property("frequency 4") =
@@ -263,7 +263,7 @@ object GenSpecification extends Properties("Gen") with GenSpecificationVersionSp
263263
val lst = x :: y :: rest
264264
forAll(choose(-1, 2 * lst.length)) { n =>
265265
val gs = rest.map(Gen.const)
266-
Try(pick(n, Gen.const(x), Gen.const(y), gs: _*)) match {
266+
Try(pick(n, Gen.const(x), Gen.const(y), gs*)) match {
267267
case Success(g) =>
268268
forAll(g) { m => m.length == n && m.forall(lst.contains) }
269269
case Failure(_) =>

‎core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.apache.commons.lang3.SerializationUtils
1313

1414
import java.io.Serializable
1515

16-
import util.SerializableCanBuildFroms._
16+
import util.SerializableCanBuildFroms.*
1717

1818
object SerializabilitySpecification extends Properties("Serializability") {
1919

‎core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object ShrinkSpecificationJVM extends Properties("Shrink JVM") {
3232
property("xmap vector from list") = forAll { (v: Vector[Int]) =>
3333
(!v.isEmpty && v != Vector(0)) ==> {
3434
val vs = shrinkClosure(v)
35-
Vector(vs: _*).toString |: (vs.contains(Vector.empty) && vs.contains(Vector(0)))
35+
Vector(vs*).toString |: (vs.contains(Vector.empty) && vs.contains(Vector(0)))
3636
}
3737
}
3838

‎core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
package org.scalacheck
1111

12-
import Gen._
13-
import Prop._
14-
import Test._
15-
import Arbitrary._
12+
import Gen.*
13+
import Prop.*
14+
import Test.*
15+
import Arbitrary.*
1616

1717
object TestSpecification extends Properties("Test") {
1818

‎core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.scalacheck.commands
1111

12-
import org.scalacheck._
12+
import org.scalacheck.*
1313

1414
object CommandsSpecification extends Properties("Commands") {
1515

‎core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.scalacheck.Prop.AnyOperators
1313
import org.scalacheck.Prop.forAll
1414

1515
import java.util.HashMap
16-
import scala.collection.JavaConverters._
16+
import scala.collection.JavaConverters.*
1717
import scala.collection.immutable.IntMap
1818

1919
object IntMapSpec extends org.scalacheck.Properties("IntMap") {
@@ -28,7 +28,7 @@ object IntMapSpec extends org.scalacheck.Properties("IntMap") {
2828
/** Create an IntMap and a HashMap with the same contents */
2929
private def createMaps(l: List[Int]) = {
3030
val mappings = for (n <- l) yield (n, new Object)
31-
val im = IntMap(mappings: _*)
31+
val im = IntMap(mappings*)
3232
val hm = new HashMap[Int, Any]
3333
for ((n, x) <- mappings) hm.put(n, x)
3434
(hm, im)

‎core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.scalacheck.example
1111

12-
import org.scalacheck._
12+
import org.scalacheck.*
1313

1414
object StringUtils extends Properties("Examples.StringUtils") {
1515

‎core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
package org.scalacheck.time
1111

12-
import org.scalacheck.Prop._
13-
import org.scalacheck.Shrink._
14-
import org.scalacheck._
12+
import org.scalacheck.Prop.*
13+
import org.scalacheck.Shrink.*
14+
import org.scalacheck.*
1515

16-
import java.time._
16+
import java.time.*
1717

1818
object ShrinkSpecification extends Properties("time.Shrink") {
1919
property("shrink[Duration]") = forAll { (n: Duration) =>

‎core/native/src/main/scala/org/scalacheck/Platform.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package org.scalacheck
1212
import scala.annotation.nowarn
1313
import scala.scalanative.reflect.Reflect
1414

15-
import Test._
15+
import Test.*
1616

1717
private[scalacheck] object Platform {
1818

@@ -35,13 +35,13 @@ private[scalacheck] object Platform {
3535
}
3636

3737
@nowarn("msg=is never used")
38-
def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[_]])(args: Seq[AnyRef]): AnyRef = {
38+
def newInstance(name: String, loader: ClassLoader, paramTypes: Seq[Class[?]])(args: Seq[AnyRef]): AnyRef = {
3939
Reflect
4040
.lookupInstantiatableClass(name)
4141
.getOrElse(throw new ClassNotFoundException(name))
42-
.getConstructor(paramTypes: _*)
42+
.getConstructor(paramTypes*)
4343
.getOrElse(throw new NoSuchMethodError(paramTypes.mkString("<init>(", ",", ")")))
44-
.newInstance(args: _*)
44+
.newInstance(args*)
4545
.asInstanceOf[AnyRef]
4646
}
4747

‎core/shared/src/main/scala-2.12-/org/scalacheck/util/BuildableVersionSpecific.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package org.scalacheck.util
1111

1212
import java.util.{ArrayList, HashMap}
1313

14-
import collection.{Map => _, _}
14+
import collection.{Map as _, *}
1515
import generic.CanBuildFrom
1616
import scala.collection.mutable.Builder
1717

‎core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package org.scalacheck.util
1111

1212
import java.util.{ArrayList, HashMap}
1313
import scala.collection.mutable.Builder
14-
import scala.collection.{Map => _, _}
14+
import scala.collection.{Map as _, *}
1515

1616
private[util] trait BuildableVersionSpecific {
1717

‎core/shared/src/main/scala/org/scalacheck/Arbitrary.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import scala.util.Try
1717

1818
import concurrent.Future
1919
import util.Buildable
20-
import util.SerializableCanBuildFroms._
20+
import util.SerializableCanBuildFroms.*
2121

2222
/** Define an arbitrary generator for properties
2323
*
@@ -236,7 +236,7 @@ private[scalacheck] sealed trait ArbitraryLowPriority {
236236

237237
/** Arbitrary BigDecimal */
238238
implicit lazy val arbBigDecimal: Arbitrary[BigDecimal] = {
239-
import java.math.MathContext, MathContext._
239+
import java.math.MathContext, MathContext.*
240240

241241
val genMathContext0: Gen[MathContext] =
242242
oneOf(DECIMAL32, DECIMAL64, DECIMAL128)
@@ -316,7 +316,7 @@ private[scalacheck] sealed trait ArbitraryLowPriority {
316316

317317
/** Generates an arbitrary property */
318318
implicit lazy val arbProp: Arbitrary[Prop] = {
319-
import Prop._
319+
import Prop.*
320320
val undecidedOrPassed = forAll { (b: Boolean) =>
321321
b ==> true
322322
}

‎core/shared/src/main/scala/org/scalacheck/Gen.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package org.scalacheck
1111

1212
import java.math.BigInteger
13-
import java.math.{BigDecimal => JavaDecimal}
13+
import java.math.{BigDecimal as JavaDecimal}
1414
import java.util.Calendar
1515
import java.util.UUID
1616
import scala.annotation.tailrec
@@ -21,8 +21,8 @@ import scala.concurrent.duration.FiniteDuration
2121

2222
import rng.Seed
2323
import util.Buildable
24-
import util.SerializableCanBuildFroms._
25-
import ScalaVersionSpecific._
24+
import util.SerializableCanBuildFroms.*
25+
import ScalaVersionSpecific.*
2626

2727
/** A generator produces values for [[Prop]]s
2828
*
@@ -1061,7 +1061,7 @@ object Gen extends GenArities with GenVersionSpecific {
10611061

10621062
/** A generator that picks a random number of elements from a list */
10631063
def someOf[T](g1: Gen[T], g2: Gen[T], gs: Gen[T]*) =
1064-
choose(0, gs.length + 2).flatMap(pick(_, g1, g2, gs: _*))
1064+
choose(0, gs.length + 2).flatMap(pick(_, g1, g2, gs*))
10651065

10661066
/** A generator that picks at least one element from a list */
10671067
def atLeastOne[T](l: Iterable[T]) = {
@@ -1071,7 +1071,7 @@ object Gen extends GenArities with GenVersionSpecific {
10711071

10721072
/** A generator that picks at least one element from a list */
10731073
def atLeastOne[T](g1: Gen[T], g2: Gen[T], gs: Gen[T]*) =
1074-
choose(1, gs.length + 2).flatMap(pick(_, g1, g2, gs: _*))
1074+
choose(1, gs.length + 2).flatMap(pick(_, g1, g2, gs*))
10751075

10761076
/** A generator that randomly picks a given number of elements from a list
10771077
*
@@ -1385,9 +1385,9 @@ object Gen extends GenArities with GenVersionSpecific {
13851385
/** Generates positive numbers of uniform distribution, with an upper bound of the generation size parameter.
13861386
*/
13871387
def posNum[T](implicit num: Numeric[T], c: Choose[T]): Gen[T] = {
1388-
import num._
1388+
import num.*
13891389
num match {
1390-
case _: Fractional[_] => sized(n => c.choose(zero, max(fromInt(n), one)).suchThat(_ != zero))
1390+
case _: Fractional[?] => sized(n => c.choose(zero, max(fromInt(n), one)).suchThat(_ != zero))
13911391
case _ => sized(n => c.choose(one, max(fromInt(n), one)))
13921392
}
13931393
}
@@ -1405,14 +1405,14 @@ object Gen extends GenArities with GenVersionSpecific {
14051405
num: Numeric[T],
14061406
c: Choose[T]
14071407
): Gen[T] = {
1408-
import num._
1408+
import num.*
14091409
val basics = List(minT, maxT, zero, one, -one)
14101410
val basicsAndSpecials = for {
14111411
t <- specials ++ basics if t >= minT && t <= maxT
14121412
} yield (1, const(t))
14131413
val other = (basicsAndSpecials.length, c.choose(minT, maxT))
14141414
val allGens = basicsAndSpecials :+ other
1415-
frequency(allGens: _*)
1415+
frequency(allGens*)
14161416
}
14171417

14181418
//// Misc Generators ////
@@ -1428,7 +1428,7 @@ object Gen extends GenArities with GenVersionSpecific {
14281428
)
14291429

14301430
lazy val calendar: Gen[Calendar] = { // FIXME: Remove lazy
1431-
import Calendar._
1431+
import Calendar.*
14321432

14331433
def adjust(c: Calendar)(f: Calendar => Unit): Calendar = { f(c); c }
14341434

0 commit comments

Comments
 (0)