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.5 #3518

Closed
wants to merge 3 commits into from
Closed
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
Expand Up @@ -21,3 +21,6 @@ e5525d3f0da44052fdcfbe844993260bdc044270

# Scala Steward: Reformat with scalafmt 3.8.2
a0a37ece16ee55056270b4d9ba5c1505ead8af17

# Scala Steward: Reformat with scalafmt 3.8.5
af56fda3d44f2e3ab32d7d06ab52e330bf635e73
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.2"
version = "3.8.5"

style = default

Expand Down
7 changes: 5 additions & 2 deletions core/shared/src/main/scala/fs2/concurrent/Signal.scala
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,11 @@ object SignallingMapRef {
.map { case (state, ids) =>
def newId = ids.getAndUpdate(_ + 1)

def updateAndNotify[U](state: State, k: K, f: Option[V] => (Option[V], U))
: (State, F[U]) = {
def updateAndNotify[U](
state: State,
k: K,
f: Option[V] => (Option[V], U)
): (State, F[U]) = {

val keyState = state.keys.get(k)

Expand Down
5 changes: 2 additions & 3 deletions core/shared/src/test/scala/fs2/StreamPerformanceSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,8 @@ class StreamPerformanceSuite extends Fs2Suite {
val s: Stream[SyncIO, Int] =
List
.fill(N)(bracketed)
.foldLeft(Stream.raiseError[SyncIO](new Err): Stream[SyncIO, Int]) {
(acc, hd) =>
acc.handleErrorWith(_ => hd)
.foldLeft(Stream.raiseError[SyncIO](new Err): Stream[SyncIO, Int]) { (acc, hd) =>
acc.handleErrorWith(_ => hd)
}
s.compile.toList.attempt
.flatMap(_ => (ok.get, open.get).tupled)
Expand Down
11 changes: 5 additions & 6 deletions io/jvm/src/test/scala/fs2/io/IoPlatformSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,11 @@ class IoPlatformSuite extends Fs2Suite {
(bs1.length != (o1 + l1)) &&
// we expect that next slice will wrap same buffer
((bs2 eq bs1) && (o2 == o1 + l1))
} || {
// if first slice buffer is 'full'
(bs2.length == (o1 + l1)) &&
// we expect new buffer allocated for next slice
((bs2 ne bs1) && (o2 == 0))
}
} ||
// if first slice buffer is 'full'
(bs2.length == (o1 + l1)) &&
// we expect new buffer allocated for next slice
((bs2 ne bs1) && (o2 == 0))
case _ => false // unexpected chunk subtype
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ object BlockCodec {
("Block Total Length" | constant(length.bv) )}
// format: on

def unknownByteOrder[L <: HList, LB <: HList](hexConstant: ByteVector)(f: Length => Codec[L])(
implicit
def unknownByteOrder[L <: HList, LB <: HList](
hexConstant: ByteVector
)(f: Length => Codec[L])(implicit
prepend: Prepend.Aux[L, Unit :: HNil, LB],
init: Init.Aux[LB, L],
last: Last.Aux[LB, Unit]
Expand Down
Loading