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.4 #773

Merged
merged 3 commits into from
Jan 14, 2025
Merged
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
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.5
465602629d39f68ce5442d609ec0f90c0b085625

# Scala Steward: Reformat with scalafmt 3.8.4
a485aac47efed8c075ac6e11d1464824422f0a77
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.4

runner.dialect = scala213
maxColumn = 120
Expand Down
2 changes: 1 addition & 1 deletion aws/src/main/scala/com/kevel/apso/aws/S3Bucket.scala
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class S3Bucket(

/** Returns the last modified timestamp of the file in the location specified by `key` in the bucket. If the file
* doesn't exist the return value is 0L. The decision to return 0L in those cases is to align with
* `java.io.File#lastModified()`'s behavior.
* `java.io.File#lastModified()` 's behavior.
*
* @param key
* the remote pathname for the file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ final class DeboxMap[
if (status == 3 && keys(j) == key) {
buckets(j) = 2
len -= 1
} else if (status == 0) {} else {
} else if (status == 0) {}
else {
loop((i << 2) + i + perturbation + 1, perturbation >> 5)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ class ElasticsearchBulkInserter(
super.postStop()

log.info("Stopping Bulk Inserter...")
val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() }
else Future(client.close())
val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() } else Future(client.close())

Try(Await.result(stop, timeoutOnStop)).failed.foreach { ex =>
logErrorOrWarning("Failed to cleanly stop Bulk Inserter!", Some(ex))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ class ElasticsearchBulkInserter(
super.postStop()

log.info("Stopping Bulk Inserter...")
val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() }
else Future(client.close())
val stop = if (buffer.nonEmpty) flush().andThen { case _ => client.close() } else Future(client.close())

Try(Await.result(stop, timeoutOnStop)).failed.foreach { ex =>
logErrorOrWarning("Failed to cleanly stop Bulk Inserter!", Some(ex))
Expand Down
Loading