Skip to content

Commit 30b0fdc

Browse files
authored
Merge pull request #3522 from typelevel/update/scalafmt-core-3.8.6
Update scalafmt-core to 3.8.6
2 parents 20bcc7e + ca943b1 commit 30b0fdc

File tree

7 files changed

+20
-16
lines changed

7 files changed

+20
-16
lines changed

.git-blame-ignore-revs

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

2222
# Scala Steward: Reformat with scalafmt 3.8.2
2323
a0a37ece16ee55056270b4d9ba5c1505ead8af17
24+
25+
# Scala Steward: Reformat with scalafmt 3.8.6
26+
52e52b013db077ecb5b5a8f5b6e6113f912556d8

.scalafmt.conf

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

33
style = default
44

core/shared/src/main/scala/fs2/concurrent/Signal.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,11 @@ object SignallingMapRef {
481481
.map { case (state, ids) =>
482482
def newId = ids.getAndUpdate(_ + 1)
483483

484-
def updateAndNotify[U](state: State, k: K, f: Option[V] => (Option[V], U))
485-
: (State, F[U]) = {
484+
def updateAndNotify[U](
485+
state: State,
486+
k: K,
487+
f: Option[V] => (Option[V], U)
488+
): (State, F[U]) = {
486489

487490
val keyState = state.keys.get(k)
488491

core/shared/src/test/scala/fs2/StreamPerformanceSuite.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,8 @@ class StreamPerformanceSuite extends Fs2Suite {
198198
val s: Stream[SyncIO, Int] =
199199
List
200200
.fill(N)(bracketed)
201-
.foldLeft(Stream.raiseError[SyncIO](new Err): Stream[SyncIO, Int]) {
202-
(acc, hd) =>
203-
acc.handleErrorWith(_ => hd)
201+
.foldLeft(Stream.raiseError[SyncIO](new Err): Stream[SyncIO, Int]) { (acc, hd) =>
202+
acc.handleErrorWith(_ => hd)
204203
}
205204
s.compile.toList.attempt
206205
.flatMap(_ => (ok.get, open.get).tupled)

core/shared/src/test/scala/fs2/StreamZipSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ class StreamZipSuite extends Fs2Suite {
177177
Logger[IO]
178178
.flatMap { logger =>
179179
def s(tag: String) =
180-
logger.logLifecycle(tag) >> {
180+
logger.logLifecycle(tag) >>
181181
logger.logLifecycle(s"$tag - 1") ++ logger.logLifecycle(s"$tag - 2")
182-
}
183182

184183
s("a").zip(s("b")).compile.drain >>
185184
logger.get.assertEquals(

io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ class IoPlatformSuite extends Fs2Suite {
6464
(bs1.length != (o1 + l1)) &&
6565
// we expect that next slice will wrap same buffer
6666
((bs2 eq bs1) && (o2 == o1 + l1))
67-
} || {
68-
// if first slice buffer is 'full'
69-
(bs2.length == (o1 + l1)) &&
70-
// we expect new buffer allocated for next slice
71-
((bs2 ne bs1) && (o2 == 0))
72-
}
67+
} ||
68+
// if first slice buffer is 'full'
69+
(bs2.length == (o1 + l1)) &&
70+
// we expect new buffer allocated for next slice
71+
((bs2 ne bs1) && (o2 == 0))
7372
case _ => false // unexpected chunk subtype
7473
}
7574
}

protocols/shared/src/main/scala-2/fs2/protocols/pcapng/BlockCodec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ object BlockCodec {
4444
("Block Total Length" | constant(length.bv) )}
4545
// format: on
4646

47-
def unknownByteOrder[L <: HList, LB <: HList](hexConstant: ByteVector)(f: Length => Codec[L])(
48-
implicit
47+
def unknownByteOrder[L <: HList, LB <: HList](
48+
hexConstant: ByteVector
49+
)(f: Length => Codec[L])(implicit
4950
prepend: Prepend.Aux[L, Unit :: HNil, LB],
5051
init: Init.Aux[LB, L],
5152
last: Last.Aux[LB, Unit]

0 commit comments

Comments
 (0)