Skip to content

Commit

Permalink
Merge pull request #256 from scala-steward/update/scalafmt-core-3.8.6
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.6
  • Loading branch information
sh0hei authored Feb 1, 2025
2 parents a426dbe + 15ebe14 commit 8807f1a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.6
7de29d7a2e1d1e2e83ab2f5c55ba5b7ccd0eeee4
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

runner.dialect = scala213

Expand Down
13 changes: 6 additions & 7 deletions src/test/scala/sangria/streaming/AkkStreamsIntegrationSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class AkkStreamsIntegrationSpec extends AnyWordSpec with Matchers {

val updated = impl.onComplete(source(1, 2, 3))(inc())

Await.ready(updated.runWith(Sink.last), 2 seconds)
Await.ready(updated.runWith(Sink.last), 2.seconds)

count.get() should be(1)
}
Expand All @@ -76,15 +76,14 @@ class AkkStreamsIntegrationSpec extends AnyWordSpec with Matchers {

val updated = impl.onComplete(s)(inc())

Await.ready(updated.runWith(Sink.last), 2 seconds)
Await.ready(updated.runWith(Sink.last), 2.seconds)

count.get() should be(1)
}

"flatMapFuture" in {
res(
impl.flatMapFuture(Future.successful(1))(i =>
source(i.toString, (i + 1).toString))) should be(List("1", "2"))
res(impl.flatMapFuture(Future.successful(1))(i =>
source(i.toString, (i + 1).toString))) should be(List("1", "2"))
}

"recover" in {
Expand Down Expand Up @@ -142,8 +141,8 @@ class AkkStreamsIntegrationSpec extends AnyWordSpec with Matchers {
Source.fromIterator(() => Iterator(elems: _*))

def res[T](s: Source[T, NotUsed]) =
Await.result(s.runFold(List.empty[T]) { case (acc, e) => acc :+ e }, 2 seconds)
Await.result(s.runFold(List.empty[T]) { case (acc, e) => acc :+ e }, 2.seconds)

def res[T](f: Future[T]) =
Await.result(f, 2 seconds)
Await.result(f, 2.seconds)
}

0 comments on commit 8807f1a

Please sign in to comment.