Skip to content

Commit

Permalink
Merge pull request gnieh#656 from scala-steward/update/scalafmt-core-…
Browse files Browse the repository at this point in the history
…3.8.6

Update scalafmt-core to 3.8.6
  • Loading branch information
ybasket authored Jan 27, 2025
2 parents 40e54a6 + 05b047f commit 27b7145
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ fea14587946435c396af3513cd86c46680753708

# Scala Steward: Reformat with scalafmt 3.8.2
2a8af054e3305720a92f2fcbdc18abeda4390f0f

# Scala Steward: Reformat with scalafmt 3.8.6
0b243e376eb4c6676dc1cfdc65bf12cf98205228
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.3"
version = "3.8.6"
maxColumn = 120
danglingParentheses.preset = false
align.preset = some
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,14 @@ object CborToJsonSpec extends SimpleIOSuite {
.toList
.map(tokens =>
expect.same(
List(Token.StartArray,
Token.StringValue("Zmlyc3Q"),
Token.StringValue("c2Vjb25k"),
Token.StringValue("dGhpcmQ"),
Token.StringValue("Zm91cnRo"),
Token.EndArray),
List(
Token.StartArray,
Token.StringValue("Zmlyc3Q"),
Token.StringValue("c2Vjb25k"),
Token.StringValue("dGhpcmQ"),
Token.StringValue("Zm91cnRo"),
Token.EndArray
),
tokens
))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ object ESPSpec extends IOSuite {

test("reverse tree") { esp =>
Stream
.emits(
List[MiniXML](
.emits(List[MiniXML](
// format: off
MiniXML.Open("a"),
MiniXML.Open("rev"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,7 @@ abstract class QuerySpec(credit: Int) extends SimpleIOSuite {
.flatMap(_.esp[IO])
.flatMap { esp =>
Stream
.emits(
List[MiniXML](
.emits(List[MiniXML](
// format: off
MiniXML.Open("doc"),
MiniXML.Open("a"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ object ArticleSpec extends IOSuite {

test("article to html") { esp =>
Stream
.emits(
List[MiniXML](
.emits(List[MiniXML](
// format: off
MiniXML.Open("article"),
MiniXML.Open("title"),
Expand Down
21 changes: 11 additions & 10 deletions json/src/test/scala/fs2/data/json/jsonpath/JsonPathSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,17 @@ object JsonPathSpec extends SimpleIOSuite {
.parEvalMapUnbounded(_.compile.toList)
.compile
.toList
.map(expect.same(
List(
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("0"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("1"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("2"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("3"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("4"), Token.EndObject)
),
_
))
.map(
expect.same(
List(
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("0"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("1"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("2"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("3"), Token.EndObject),
List(Token.StartObject, Token.Key("idx"), Token.NumberValue("4"), Token.EndObject)
),
_
))

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ private[internal] object FormatParsers {
}
}

def parseFloat32[F[_]](ctx: ParserContext[F])(implicit
F: RaiseThrowable[F]): Pull[F, MsgpackItem, ParserContext[F]] = {
def parseFloat32[F[_]](
ctx: ParserContext[F])(implicit F: RaiseThrowable[F]): Pull[F, MsgpackItem, ParserContext[F]] = {
requireBytes(4, ctx).map {
_.accumulate { v =>
MsgpackItem.Float32 {
Expand Down Expand Up @@ -147,8 +147,8 @@ private[internal] object FormatParsers {
}
}

def parseFloat64[F[_]](ctx: ParserContext[F])(implicit
F: RaiseThrowable[F]): Pull[F, MsgpackItem, ParserContext[F]] = {
def parseFloat64[F[_]](
ctx: ParserContext[F])(implicit F: RaiseThrowable[F]): Pull[F, MsgpackItem, ParserContext[F]] = {
requireBytes(8, ctx).map {
_.accumulate { v =>
MsgpackItem.Float64 {
Expand Down

0 comments on commit 27b7145

Please sign in to comment.