Skip to content

Commit 6ca6488

Browse files
Update scalafmt-core to 3.9.10 (#376)
## About this PR 📦 Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from `3.9.4` to `3.9.10` 📜 [GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.9.10) - [Version Diff](scalameta/scalafmt@v3.9.4...v3.9.10) ## Usage ✅ **Please merge!** I'll automatically update this PR to resolve conflicts as long as you don't change it yourself. If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below. Configure Scala Steward for your repository with a [`.scala-steward.conf`](https://github.com/scala-steward-org/scala-steward/blob/61ad65418ecca03c6cb60b5317445bd9e60f7a53/docs/repo-specific-configuration.md) file. _Have a fantastic day writing Scala!_ <details> <summary>⚙ Adjust future updates</summary> Add this to your `.scala-steward.conf` file to ignore future updates of this dependency: ``` updates.ignore = [ { groupId = "org.scalameta", artifactId = "scalafmt-core" } ] ``` Or, add this to slow down future updates of this dependency: ``` dependencyOverrides = [{ pullRequests = { frequency = "30 days" }, dependency = { groupId = "org.scalameta", artifactId = "scalafmt-core" } }] ``` </details> <sup> labels: library-update, early-semver-patch, semver-spec-patch, commit-count:n:3 </sup> <!-- scala-steward = { "Update" : { "ForArtifactId" : { "crossDependency" : [ { "groupId" : "org.scalameta", "artifactId" : { "name" : "scalafmt-core", "maybeCrossName" : "scalafmt-core_2.13" }, "version" : "3.9.4", "sbtVersion" : null, "scalaVersion" : null, "configurations" : null } ], "newerVersions" : [ "3.9.10" ], "newerGroupId" : null, "newerArtifactId" : null } }, "Labels" : [ "library-update", "early-semver-patch", "semver-spec-patch", "commit-count:n:3" ] } --> --------- Co-authored-by: scala-steward <scala-steward>
1 parent 7c1f526 commit 6ca6488

File tree

15 files changed

+20
-17
lines changed

15 files changed

+20
-17
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ b73b3c3f8fcaaa70595cd267f7242b0a0c345039
1212

1313
# Scala Steward: Reformat with scalafmt 3.8.5
1414
49688a6ac2f4d2b05006524970e3758aa84002c0
15+
16+
# Scala Steward: Reformat with scalafmt 3.9.10
17+
f74af0b3f4b0c8385127bd16e3443542db820421

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.9.4
1+
version = 3.9.10
22
maxColumn = 140
33
runner.dialect = scala3
44

core/src/main/scala/ox/channels/SourceOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ trait SourceOps[+T]:
108108
override def next(): T = forceNext() match
109109
case ChannelClosed.Done => throw new NoSuchElementException
110110
case e: ChannelClosed.Error => throw e.toThrowable
111-
case t: T @unchecked =>
111+
case t: T @unchecked =>
112112
v = None
113113
t
114114
Source.fromIterator(f(it))

core/src/main/scala/ox/either.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ object either:
110110
/** Unwrap the value of the `Option`, short-circuiting the computation to the enclosing [[either]] on guaranteed `None`. */
111111
transparent inline def ok(): A =
112112
summonFrom {
113-
case given boundary.Label[Either[Unit, Nothing]] => break(Left(()))
113+
case given boundary.Label[Either[Unit, Nothing]] => break(Left(()))
114114
case given boundary.Label[Either[Nothing, Nothing]] =>
115115
error(
116116
"The enclosing `either` call uses a different error type.\nIf it's explicitly typed, is the error type correct?\nNote that for options, the error type must contain a `Unit`."
@@ -133,7 +133,7 @@ object either:
133133
/** Fail the computation, short-circuiting to the enclosing [[either]] block. */
134134
transparent inline def fail(): Nothing =
135135
summonFrom {
136-
case given boundary.Label[Either[E, Nothing]] => break(Left(e))
136+
case given boundary.Label[Either[E, Nothing]] => break(Left(e))
137137
case given boundary.Label[Either[Nothing, Nothing]] =>
138138
error("The enclosing `either` call uses a different error type.\nIf it's explicitly typed, is the error type correct?")
139139
}

core/src/main/scala/ox/flow/FlowCompanionOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ trait FlowCompanionOps:
190190
flows match
191191
case Nil => Flow.empty
192192
case single :: Nil => single
193-
case _ =>
193+
case _ =>
194194
usingEmitInline: emit =>
195195
val results = BufferCapacity.newChannel[T]
196196
unsupervised:

core/src/main/scala/ox/flow/FlowCompanionReactiveOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ trait FlowCompanionReactiveOps:
5858
t match
5959
case ChannelClosed.Done => false
6060
case e: ChannelClosed.Error => throw e.toThrowable
61-
case t: T @unchecked =>
61+
case t: T @unchecked =>
6262
emit(t)
6363

6464
// if we have an element, onSubscribe must have already happened; we can read the subscription and cache it for later

core/src/main/scala/ox/flow/FlowOps.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ class FlowOps[+T]:
454454
s1.receiveOrClosed() match
455455
case ChannelClosed.Done => false
456456
case e: ChannelClosed.Error => throw e.toThrowable
457-
case t: T @unchecked =>
457+
case t: T @unchecked =>
458458
s2.receiveOrClosed() match
459459
case ChannelClosed.Done => false
460460
case e: ChannelClosed.Error => throw e.toThrowable
@@ -489,7 +489,7 @@ class FlowOps[+T]:
489489
() => false
490490
)
491491
case e: ChannelClosed.Error => throw e.toThrowable
492-
case t: T @unchecked =>
492+
case t: T @unchecked =>
493493
receiveFromOther(
494494
t,
495495
() =>

core/src/main/scala/ox/flow/FlowReactiveOps.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ trait FlowReactiveOps[+T]:
9999
case signals.Received(Signal.Cancel) => cancel()
100100
case errors.Received(_) => // impossible
101101
case ChannelClosed.Done => // impossible
102-
case ChannelClosed.Error(e) => // only `errors` can be closed due to an error
102+
case ChannelClosed.Error(e) => // only `errors` can be closed due to an error
103103
cancel()
104104
errorSent = true
105105
subscriber.onError(e)
@@ -108,7 +108,7 @@ trait FlowReactiveOps[+T]:
108108
case signals.Received(Signal.Request(n)) => increaseDemand(n)
109109
case signals.Received(Signal.Cancel) => cancel()
110110
case errors.Received(_) => // impossible
111-
case data.Received(t: T) =>
111+
case data.Received(t: T) =>
112112
subscriber.onNext(t)
113113
demand -= 1
114114
case ChannelClosed.Done => // only `data` can be done

core/src/main/scala/ox/flow/FlowRunOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ trait FlowRunOps[+T]:
3030
// in a fork
3131
last match
3232
case FlowStage.FromSource(source) => source
33-
case _ =>
33+
case _ =>
3434
val ch = BufferCapacity.newChannel[T]
3535
runLastToChannelAsync(ch)
3636
ch

core/src/main/scala/ox/flow/internal/WeightedHeap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ case class WeightedHeap[T](
5555
def insert(value: T, weight: Long): WeightedHeap[T] =
5656
valueToIndex.get(value) match
5757
case Some(_) => updateWeight(value, weight)
58-
case None =>
58+
case None =>
5959
val newHeap = heap :+ (value, weight)
6060
val newMap = valueToIndex + (value -> (newHeap.length - 1))
6161
val (finalHeap, finalMap) = bubbleUp(newHeap, newMap, newHeap.length - 1)

0 commit comments

Comments
 (0)