Skip to content

Commit 4b610d7

Browse files
authored
Merge pull request #1137 from Gedochao/scalafmt-3.5.8
Update `scalafmt` to 3.5.8
2 parents 8d643ee + fc5b0fe commit 4b610d7

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.5.2"
1+
version = "3.5.8"
22

33
align.preset = more
44
maxColumn = 100

modules/cli/src/main/scala/scala/cli/internal/Pid.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Pid {
66
def get(): Integer =
77
try {
88
val pid = ManagementFactory.getRuntimeMXBean.getName.takeWhile(_ != '@').toInt
9-
(pid: Integer)
9+
pid: Integer
1010
}
1111
catch {
1212
case _: NumberFormatException => null

modules/directives/src/main/scala/scala/build/preprocessing/directives/UsingPlatformDirectiveHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ case object UsingPlatformDirectiveHandler extends UsingDirectiveHandler {
7878
scalaOptions = mergedBuildOption.scalaOptions.copy(
7979
extraPlatforms =
8080
mergedBuildOption.scalaOptions.extraPlatforms ++ platforms.tail.map(p =>
81-
(p.value -> Positioned(p.positions, ()))
81+
p.value -> Positioned(p.positions, ())
8282
).toMap
8383
)
8484
)

modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object TestUtil {
105105

106106
def retryOnCi[T](maxAttempts: Int = 3, waitDuration: FiniteDuration = 5.seconds)(
107107
run: => T
108-
) = retry((if (isCI) maxAttempts else 1), waitDuration)(run)
108+
) = retry(if (isCI) maxAttempts else 1, waitDuration)(run)
109109

110110
// Same as os.RelPath.toString, but for the use of File.separator instead of "/"
111111
def relPathStr(relPath: os.RelPath): String =

project/deps.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ object Deps {
106106
def scala3Compiler(sv: String) = ivy"org.scala-lang:scala3-compiler_3:$sv"
107107
def scalaAsync = ivy"org.scala-lang.modules::scala-async:1.0.1".exclude("*" -> "*")
108108
def scalac(sv: String) = ivy"org.scala-lang:scala-compiler:$sv"
109-
def scalafmtCli = ivy"org.scalameta:scalafmt-cli_2.13:3.5.2"
109+
def scalafmtCli = ivy"org.scalameta:scalafmt-cli_2.13:3.5.8"
110110
// Force using of 2.13 - is there a better way?
111111
def scalaJsEnvJsdomNodejs =
112112
ivy"org.scala-js:scalajs-env-jsdom-nodejs_2.13:1.1.0"

project/settings.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def cs: T[String] = T.persistent {
108108
if (os.isFile(dest))
109109
dest.toString
110110
else
111-
(downloadOpt().getOrElse(fromPath("cs")): String)
111+
downloadOpt().getOrElse(fromPath("cs")): String
112112
}
113113

114114
def platformExtension: String =

website/docs/commands/fmt.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ scala-cli fmt -F --version
5656
```
5757

5858
```text
59-
scalafmt 3.5.2
59+
scalafmt 3.5.8
6060
```
6161

6262
</ChainedSnippets>
@@ -71,7 +71,7 @@ scala-cli fmt --scalafmt-help
7171
```
7272

7373
```text
74-
scalafmt 3.5.2
74+
scalafmt 3.5.8
7575
Usage: scalafmt [options] [<file>...]
7676
7777
-h, --help prints this usage text
@@ -89,7 +89,7 @@ would be ignored. In order to prevent that from happening, the `--respect-projec
8989
default.
9090

9191
```text title=.scalafmt.conf
92-
version = 3.5.2
92+
version = 3.5.8
9393
runner.dialect = scala3
9494
project {
9595
includePaths = [

0 commit comments

Comments
 (0)