Skip to content

Commit c0fff2f

Browse files
Update scalafmt-core to 3.10.2 (#438)
## About this PR πŸ“¦ Updates [org.scalameta:scalafmt-core](https://github.com/scalameta/scalafmt) from `3.10.1` to `3.10.2` πŸ“œ [GitHub Release Notes](https://github.com/scalameta/scalafmt/releases/tag/v3.10.2) - [Version Diff](scalameta/scalafmt@v3.10.1...v3.10.2) ## 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/aa5f323f89a14438111266f586018b68db1de989/docs/repo-specific-configuration.md) file. _Have a fantastic day writing Scala!_ <details> <summary>πŸ” Files still referring to the old version number</summary> The following files still refer to the old version number (3.10.1). You might want to review and update them manually. ``` .git-blame-ignore-revs ``` </details> <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, old-version-remains, commit-count:n:3 </sup> <!-- scala-steward = { "Update" : { "ForArtifactId" : { "crossDependency" : [ { "groupId" : "org.scalameta", "artifactId" : { "name" : "scalafmt-core", "maybeCrossName" : "scalafmt-core_2.13" }, "version" : "3.10.1", "sbtVersion" : null, "scalaVersion" : null, "configurations" : null } ], "newerVersions" : [ "3.10.2" ], "newerGroupId" : null, "newerArtifactId" : null } }, "Labels" : [ "library-update", "early-semver-patch", "semver-spec-patch", "old-version-remains", "commit-count:n:3" ] } -->
1 parent f8473f3 commit c0fff2f

File tree

13 files changed

+122
-100
lines changed

13 files changed

+122
-100
lines changed

β€Ž.git-blame-ignore-revsβ€Ž

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

77
# Scala Steward: Reformat with scalafmt 3.10.1
88
e20c58d38034869ac908a00d87dbb975f2cac2cc
9+
10+
# Scala Steward: Reformat with scalafmt 3.10.2
11+
097d85055d194076e79b37dac018093ab252efe0

β€Ž.scalafmt.confβ€Ž

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

33
maxColumn = 120
44

β€Žactor-tests/src/test/scala/com/evolutiongaming/akkaeffect/CounterSpec.scalaβ€Ž

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ class CounterSpec extends AsyncFunSuite with ActorSuite with Matchers {
9595
val expect = (n: Int) =>
9696
for {
9797
a <- probe.expect[Int]
98-
} yield for {
99-
a <- a
100-
} yield a.msg shouldEqual n
98+
} yield
99+
for {
100+
a <- a
101+
} yield a.msg shouldEqual n
101102
for {
102103
a <- expect(1)
103104
_ <- inc

β€Žactor/src/main/scala/com/evolutiongaming/akkaeffect/Ask.scalaβ€Ž

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,21 @@ object Ask {
9999
for {
100100
a <- af(msg)
101101
b <- self(a, timeout, sender)
102-
} yield for {
103-
b <- b
104-
b <- bf(b)
105-
} yield b
102+
} yield
103+
for {
104+
b <- b
105+
b <- bf(b)
106+
} yield b
106107
}
107108

108109
def narrow[A1 <: A, B1](f: B => F[B1])(implicit F: FlatMap[F]): Ask[F, A1, B1] = { (msg, timeout, sender) =>
109110
for {
110111
b <- self(msg, timeout, sender)
111-
} yield for {
112-
b <- b
113-
b <- f(b)
114-
} yield b
112+
} yield
113+
for {
114+
b <- b
115+
b <- f(b)
116+
} yield b
115117
}
116118
}
117119

β€Žactor/src/test/scala/com/evolutiongaming/akkaeffect/ActorVarTest.scalaβ€Ž

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@ class ActorVarTest extends AsyncFunSuite with Matchers {
8080
actorVar.receive { state0 =>
8181
for {
8282
_ <- actions.add(Action.Updated(state0, state))
83-
} yield for {
84-
state <- state
85-
} yield {
86-
val release = actions.add(Action.Released(state))
87-
Releasable(state, release.some)
88-
}
83+
} yield
84+
for {
85+
state <- state
86+
} yield {
87+
val release = actions.add(Action.Released(state))
88+
Releasable(state, release.some)
89+
}
8990
}
9091
}
9192
_ <- GenSpawn[F].cede

β€Žcluster-sharding/src/test/scala/com/evolutiongaming/akkaeffect/cluster/sharding/ClusterShardingLocalTest.scalaβ€Ž

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,26 @@ class ClusterShardingLocalTest extends AsyncFunSuite with ActorSuite with Matche
8383
)
8484

8585
actorEffect = ActorEffect.fromActor[IO](actorRef)
86-
} yield for {
87-
a <- probe.expect[Int]
88-
b <- actorEffect.ask(ShardedMsg("id", 0), 1.second)
89-
a <- a
90-
_ <- IO(a.msg shouldEqual 0)
91-
_ <- IO(a.from.tell(a.msg.toString, ActorRef.noSender))
92-
b <- b
93-
_ <- IO(b shouldEqual "0")
94-
a <- probe.expect[HandOffStopMsg.type]
95-
_ <- clusterShardingLocal.rebalance
96-
a <- a
97-
_ <- IO(a.msg shouldEqual HandOffStopMsg)
98-
r <- clusterShardingLocal.clusterSharding.regions
99-
_ <- IO(r shouldEqual Set(typeName))
100-
s <- clusterShardingLocal.clusterSharding.shards(r.head)
101-
_ <- IO(s shouldEqual Set(ShardState("1", Set.empty)))
102-
r <- clusterShardingLocal.clusterSharding.shardRegion(typeName)
103-
_ <- IO(r shouldEqual actorRef)
104-
} yield {}
86+
} yield
87+
for {
88+
a <- probe.expect[Int]
89+
b <- actorEffect.ask(ShardedMsg("id", 0), 1.second)
90+
a <- a
91+
_ <- IO(a.msg shouldEqual 0)
92+
_ <- IO(a.from.tell(a.msg.toString, ActorRef.noSender))
93+
b <- b
94+
_ <- IO(b shouldEqual "0")
95+
a <- probe.expect[HandOffStopMsg.type]
96+
_ <- clusterShardingLocal.rebalance
97+
a <- a
98+
_ <- IO(a.msg shouldEqual HandOffStopMsg)
99+
r <- clusterShardingLocal.clusterSharding.regions
100+
_ <- IO(r shouldEqual Set(typeName))
101+
s <- clusterShardingLocal.clusterSharding.shards(r.head)
102+
_ <- IO(s shouldEqual Set(ShardState("1", Set.empty)))
103+
r <- clusterShardingLocal.clusterSharding.shardRegion(typeName)
104+
_ <- IO(r shouldEqual actorRef)
105+
} yield {}
105106

106107
result
107108
.use(identity)

β€Žcluster-sharding/src/test/scala/com/evolutiongaming/akkaeffect/cluster/sharding/ClusterShardingTest.scalaβ€Ž

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ class ClusterShardingTest extends AsyncFunSuite with ActorSuite with Matchers {
5555
new LeastShardAllocationStrategy(1, 1),
5656
HandOffStopMessage,
5757
)
58-
} yield for {
59-
a <- probe.expect[Unit]
60-
_ <- IO(shardRegion.tell((), probe.actorEffect.toUnsafe))
61-
a <- a
62-
} yield a.msg
58+
} yield
59+
for {
60+
a <- probe.expect[Unit]
61+
_ <- IO(shardRegion.tell((), probe.actorEffect.toUnsafe))
62+
a <- a
63+
} yield a.msg
6364
result
6465
.use(identity)
6566
.run()

β€Ževentsourcing/src/main/scala/com/evolutiongaming/akkaeffect/eventsourcing/Engine.scalaβ€Ž

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,11 @@ object Engine {
252252
d <- Deferred[F, Either[Throwable, A]]
253253
f <- loadOf(load, d).start
254254
_ <- offer(f)
255-
} yield for {
256-
a <- d.get
257-
a <- a.liftTo[F]
258-
} yield a
255+
} yield
256+
for {
257+
a <- d.get
258+
a <- a.liftTo[F]
259+
} yield a
259260
}
260261
}
261262
engine <- fenced(engine)
@@ -312,10 +313,11 @@ object Engine {
312313
fv <- load.start // fork `load` stage to allow multiple independent executions
313314
fu = execute(fv.joinWithNever, d)
314315
_ <- queue(Key.validate.some)(fu)
315-
} yield for {
316-
e <- d.get
317-
a <- e.liftTo[F]
318-
} yield a
316+
} yield
317+
for {
318+
e <- d.get
319+
a <- e.liftTo[F]
320+
} yield a
319321

320322
/** Execute `load` with respect to:
321323
* 1. failure on `load` or `validate` will be propagated to user 2. stopped Engine will not persist any events

β€Ževentsourcing/src/main/scala/com/evolutiongaming/akkaeffect/eventsourcing/Journaller.scalaβ€Ž

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ object Journaller {
3939
for {
4040
d <- MeasureDuration[F].start
4141
r <- self.deleteTo(seqNr)
42-
} yield for {
43-
r <- r
44-
d <- d
45-
_ <- log.info(s"delete events to $seqNr in ${d.toMillis}ms")
46-
} yield r
42+
} yield
43+
for {
44+
r <- r
45+
d <- d
46+
_ <- log.info(s"delete events to $seqNr in ${d.toMillis}ms")
47+
} yield r
4748
}
4849
}

β€Žpersistence/src/main/scala/com/evolutiongaming/akkaeffect/persistence/Append.scalaβ€Ž

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,12 @@ object Append {
137137
for {
138138
d <- MeasureDuration[F].start
139139
r <- self(events)
140-
} yield for {
141-
r <- r
142-
d <- d
143-
_ <- log.debug(s"append ${events.size} events in ${d.toMillis}ms")
144-
} yield r
140+
} yield
141+
for {
142+
r <- r
143+
d <- d
144+
_ <- log.debug(s"append ${events.size} events in ${d.toMillis}ms")
145+
} yield r
145146

146147
def withFail(fail: Fail[F])(implicit F: MonadThrowable[F]): Append[F, A] = { events =>
147148
fail.adapt(s"failed to append $events")(self(events))

0 commit comments

Comments
Β (0)