raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update to a working version of Scalariform

Browse source
This commit is contained in:
Björn Antonsson 2016-06-02 14:06:57 +02:00
parent cae070bd93
commit c66ce62d63
616 changed files with 5966 additions and 5436 deletions
Download patch file Download diff file Expand all files Collapse all files

13
akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala
View file

@ -167,13 +167,12 @@ class GraphMergeSpec extends TwoStreamsSetup {
val src1 = Source.asSubscriber[Int]
val src2 = Source.asSubscriber[Int]
val (graphSubscriber1, graphSubscriber2) = RunnableGraph.fromGraph(GraphDSL.create(src1, src2)((_, _)) { implicit b ⇒
(s1, s2) ⇒
val merge = b.add(Merge[Int](2))
s1.out ~> merge.in(0)
s2.out ~> merge.in(1)
merge.out ~> Sink.fromSubscriber(down)
ClosedShape
val (graphSubscriber1, graphSubscriber2) = RunnableGraph.fromGraph(GraphDSL.create(src1, src2)((_, _)) { implicit b ⇒ (s1, s2) ⇒
val merge = b.add(Merge[Int](2))
s1.out ~> merge.in(0)
s2.out ~> merge.in(1)
merge.out ~> Sink.fromSubscriber(down)
ClosedShape
}).run()
val downstream = down.expectSubscription()