Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.8.5 #345

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ b049841d5707d5bd87be516d8cda7be2a7585eae
# Reformatted test code
e437d63c40713e0645a4895bbe5a0fc565cd56db


# Scala Steward: Reformat with scalafmt 3.8.5
0b6c88946820e502e8bb0c22cbb813f561e3e639
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.3"
version = "3.8.5"

align.preset = none
align.openParenCallSite = false
Expand Down
2 changes: 1 addition & 1 deletion build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ object os extends Module {
object testJarWriter extends JavaModule
object testJarReader extends JavaModule
object testJarExit extends JavaModule
object testSpawnExitHook extends ScalaModule{
object testSpawnExitHook extends ScalaModule {
def scalaVersion = OsJvmModule.this.scalaVersion()
def moduleDeps = Seq(OsJvmModule.this)
}
Expand Down
8 changes: 6 additions & 2 deletions os/src/FileOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,15 @@ object remove extends Function1[Path, Boolean] {
if (Files.isDirectory(nioTarget, LinkOption.NOFOLLOW_LINKS)) {
for (p <- walk.stream(target, preOrder = false)) {
try remove(p)
catch { case e: Throwable if ignoreErrors => /*ignore*/ }
catch {
case e: Throwable if ignoreErrors => /*ignore*/
}
}
}
try Files.delete(nioTarget)
catch { case e: Throwable if ignoreErrors => /*ignore*/ }
catch {
case e: Throwable if ignoreErrors => /*ignore*/
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion os/src/ProcessOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ case class proc(command: Shellable*) {
override def run(): Unit = {
while (proc.wrapped.isAlive) Thread.sleep(1)
try Runtime.getRuntime().removeShutdownHook(t)
catch { case e: Throwable => /*do nothing*/ }
catch {
case e: Throwable => /*do nothing*/
}
}
}
)
Expand Down
4 changes: 3 additions & 1 deletion os/watch/src/FSEventsWatcher.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ class FSEventsWatcher(
else {
existingFolders.add(p)
try os.walk.stream(p).foreach(nestedPaths.append(_))
catch { case e: Throwable => /*do nothing*/ }
catch {
case e: Throwable => /*do nothing*/
}
}
}
onEvent((paths ++ nestedPaths).toSet)
Expand Down
Loading