Skip to content

Commit 3430851

Browse files
authored
Merge pull request #1089 from typelevel/update/scalafmt-core-3.8.5
Update scalafmt-core to 3.8.5
2 parents a745072 + 07ce939 commit 3430851

File tree

10 files changed

+15
-13
lines changed

10 files changed

+15
-13
lines changed

.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ ccd98e22a078e1282dbb2c1acfb40fe3afee01b6
88

99
# Scala Steward: Reformat with scalafmt 3.7.6
1010
79da8216cac0c6ec8b2d6340c1980674fdd273aa
11+
12+
# Scala Steward: Reformat with scalafmt 3.8.5
13+
02696e7684220b2e88e80271e695a3803502fefe

.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.8.3
1+
version=3.8.5
22
maxColumn = 120
33
assumeStandardLibraryStripMargin = true
44

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ object GenSpecification extends Properties("Gen") with GenSpecificationVersionSp
2929
def testCase[A](gen: Gen[A]): Prop =
3030
sizedProp { sz =>
3131
val g = Gen.function1(gen)(Cogen[Int])
32-
if (sz > 0) forAll(g) { f => f(999); true }
33-
else Prop(true)
32+
if (sz > 0) forAll(g) { f => f(999); true } else Prop(true)
3433
}
3534
val p0 = testCase(arbitrary[Int].suchThat(_ != 0))
3635
val p1 = testCase(arbitrary[String].suchThat(_ != ""))

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

+1-1
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 as JavaDecimal}
13+
import java.math.BigDecimal as JavaDecimal
1414
import java.util.Calendar
1515
import java.util.UUID
1616
import scala.annotation.tailrec

core/shared/src/main/scala/org/scalacheck/Prop.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ sealed abstract class Prop extends Serializable { self =>
167167

168168
object Prop {
169169

170-
import Arbitrary.{arbitrary}
170+
import Arbitrary.arbitrary
171171

172172
// Types
173173

core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala

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

1010
package org.scalacheck
1111

12-
import Prop.{forAllNoShrink as forAll}
12+
import Prop.forAllNoShrink as forAll
1313

1414
object StatsSpecification extends Properties("Stats") {
1515

examples/commands-leveldb/src/test/scala/CommandsLevelDB.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import org.scalacheck.Gen
22
import org.scalacheck.Arbitrary.arbitrary
33
import org.scalacheck.commands.Commands
44

5-
import org.iq80.leveldb._
6-
import org.fusesource.leveldbjni.JniDBFactory._
5+
import org.iq80.leveldb.*
6+
import org.fusesource.leveldbjni.JniDBFactory.*
77

88
import scala.util.{Try, Success}
99
import scala.collection.immutable.Map

examples/commands-nix/src/test/scala/CommandsNix.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object MachineSpec extends Commands {
1414
val con = new org.libvirt.Connect("qemu:///session")
1515

1616
def runSshCmd(ip: String, cmd: String): Either[String, String] = {
17-
import scala.sys.process._
17+
import scala.sys.process.*
1818
val err = new StringBuffer()
1919
val logger = ProcessLogger(err.append(_))
2020

@@ -59,7 +59,7 @@ object MachineSpec extends Commands {
5959
"""
6060

6161
def toLibvirtXMLs(machines: State): Map[String, String] = {
62-
import scala.sys.process._
62+
import scala.sys.process.*
6363
import java.io.ByteArrayInputStream
6464

6565
val out = new StringBuffer()
@@ -70,7 +70,7 @@ object MachineSpec extends Commands {
7070
// Run nix-build and capture stdout and stderr
7171
"nix-build --no-out-link -" #< is ! logger
7272

73-
val xmlFiles = Map(machines.map(m => m.id -> s"${out.toString.trim}/${m.id}.xml"): _*)
73+
val xmlFiles = Map(machines.map(m => m.id -> s"${out.toString.trim}/${m.id}.xml")*)
7474

7575
// Check that all expected output files can be read
7676
xmlFiles.values foreach { f =>

examples/commands-redis/src/test/scala/CommandsRedis.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ object RedisSpec extends Commands {
129129
type Result = Option[Long]
130130
def run(sut: Sut) =
131131
if (keys.isEmpty) Some(0)
132-
else sut.del(keys.head, keys.tail.toSeq: _*)
132+
else sut.del(keys.head, keys.tail.toSeq*)
133133
def preCondition(state: State) = state.connected
134134
def nextState(state: State) = state.copy(
135135
contents = state.contents -- keys,

examples/scalajs/src/test/scala/example/ScalaJSExampleTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package example
22

3-
import org.scalacheck._
3+
import org.scalacheck.*
44

55
object ScalaJSExampleSpec extends Properties("ScalaCheck-scalajs") {
66

0 commit comments

Comments
 (0)