Skip to content

Commit 30a7bd6

Browse files
authored
Merge pull request #265 from scala-steward/update/scalafmt-core-2.6.0
Update scalafmt-core to 2.6.0
2 parents c08d125 + 1830f9a commit 30a7bd6

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-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 = "2.5.3"
1+
version = "2.6.0"
22

33
maxColumn = 140
44
assumeStandardLibraryStripMargin = true

cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ object AdvancedConfig {
109109
}
110110

111111
/**
112-
*
113112
* @param warnIfSetKeyspace Whether a warning is logged when a request (such as a CQL `USE ...`) changes the active
114113
* keyspace.
115114
* @param logWarnings Whether logging of server warnings generated during query execution should be disabled by the
@@ -210,7 +209,7 @@ final case class SpeculativeExecutionPolicyConfig(`class`: String, maxExecutions
210209

211210
object SpeculativeExecutionPolicyConfig {
212211

213-
/** A policy that schedules a configurable number of speculative executions, separated by a fixed delay.*/
212+
/** A policy that schedules a configurable number of speculative executions, separated by a fixed delay. */
214213
val ConstantSpeculative: SpeculativeExecutionPolicyConfig = SpeculativeExecutionPolicyConfig(
215214
"com.datastax.oss.driver.internal.core.specex.ConstantSpeculativeExecutionPolicy",
216215
Some(3),
@@ -663,7 +662,6 @@ object SchemaAgreementConfig {
663662
}
664663

665664
/**
666-
*
667665
* @param prepareOnAllNodes Overridable in a profile.
668666
*/
669667
final case class PreparedStatementsConfig(

http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/RouteMetrics.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ class RouteMetrics[F[_]: Sync](meterRegistry: MeterRegistry) {
2121
start <- F.delay(Timer.start(meterRegistry))
2222
response <- route.bracket(F.pure) { response =>
2323
F.delay(
24-
start.stop(
25-
meterRegistry
26-
.timer(s"http.$name", "status", s"${response.status.code}", "status-class", s"${response.status.code / 100}xx")
27-
)
24+
start.stop(
25+
meterRegistry
26+
.timer(s"http.$name", "status", s"${response.status.code}", "status-class", s"${response.status.code / 100}xx")
2827
)
29-
.as(())
28+
).as(())
3029
}
3130
} yield response
3231
}

0 commit comments

Comments
 (0)