Skip to content

Update scalafmt-core to 3.8.6 #656

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.

Sign up for GitHub

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

Merged
ybasket merged 4 commits into from
Jan 27, 2025
Merged

Update scalafmt-core to 3.8.6 #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c67889
Update scalafmt-core to 3.8.6
scala-steward Jan 24, 2025
0b243e3
Reformat with scalafmt 3.8.6
scala-steward Jan 24, 2025
6a46afb
Add 'Reformat with scalafmt 3.8.6' to .git-blame-ignore-revs
scala-steward Jan 24, 2025
05b047f
Merge branch 'main' into update/scalafmt-core-3.8.6
ybasket Jan 27, 2025
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
View file
Open in desktop
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
View file
Open in desktop
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
14 changes: 8 additions & 6 deletions cbor-json/shared/src/test/scala/fs2/data/cbor/CborToJsonSpec.scala
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions finite-state/shared/src/test/scala/fs2/data/esp/ESPSpec.scala
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions finite-state/shared/src/test/scala/fs2/data/mft/QuerySpec.scala
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions finite-state/shared/src/test/scala/fs2/data/pattern/example/ArticleSpec.scala
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions msgpack/src/main/scala/fs2/data/msgpack/low/internal/FormatParsers.scala
View file
Open in desktop
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
Loading