Skip to content

Commit

Permalink
Merge pull request #608 from scala-steward/update/scalafmt-core-3.8.2
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.2
  • Loading branch information
ybasket authored Jun 17, 2024
2 parents d315db1 + e1158de commit 7334d54
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ b33d964a2b7d2c5f9135702b48be2ff1711092d1

# Scala Steward: Reformat with scalafmt 3.8.1
fea14587946435c396af3513cd86c46680753708

# Scala Steward: Reformat with scalafmt 3.8.2
2a8af054e3305720a92f2fcbdc18abeda4390f0f
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.1"
version = "3.8.2"
maxColumn = 120
danglingParentheses.preset = false
align.preset = some
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import cats.effect.SyncIO
import scodec.bits._
import fs2._


@OutputTimeUnit(TimeUnit.MICROSECONDS)
@BenchmarkMode(Array(Mode.AverageTime))
@State(org.openjdk.jmh.annotations.Scope.Benchmark)
Expand All @@ -35,14 +34,16 @@ import fs2._
class MsgPackItemParserBenchmarks {

// The file contains hex representation of the values so we have to convert it
val msgpackBytes: ByteVector = ByteVector.fromHex(
fs2.io
.readClassLoaderResource[SyncIO]("twitter_msgpack.txt", 4096)
.through(fs2.text.utf8.decode)
.compile
.string
.unsafeRunSync()
).get
val msgpackBytes: ByteVector = ByteVector
.fromHex(
fs2.io
.readClassLoaderResource[SyncIO]("twitter_msgpack.txt", 4096)
.through(fs2.text.utf8.decode)
.compile
.string
.unsafeRunSync()
)
.get

@Benchmark
def parseMsgpackItems() =
Expand Down
12 changes: 7 additions & 5 deletions xml/src/test/scala/fs2/data/xml/XmlExceptionSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ object XmlExceptionSpec extends SimpleIOSuite {

expect(stream.compile.toList match {
case Right(
List(Right(XmlEvent.StartDocument),
Right(XmlEvent.StartTag(QName(None, "a"), Nil, false)),
Right(XmlEvent.StartTag(QName(None, "b"), Nil, false)),
Right(XmlEvent.XmlString("c", false)),
Left(_: XmlException))) =>
List(
Right(XmlEvent.StartDocument),
Right(XmlEvent.StartTag(QName(None, "a"), Nil, false)),
Right(XmlEvent.StartTag(QName(None, "b"), Nil, false)),
Right(XmlEvent.XmlString("c", false)),
Left(_: XmlException)
)) =>
true
case _ => false
})
Expand Down

0 comments on commit 7334d54

Please sign in to comment.