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

=act,str Port be-scala-2.13-friendly (#22528)

Browse source 
* !str #22527 fix SubSource/SubFlow.zip Pair type

* =act don't use conforms, be scala 2.13 friendly

* Update SubFlow.scala
This commit is contained in:
Konrad `ktoso` Malawski 2017-03-13 12:39:57 +01:00 • committed by GitHub
parent 5138b8f587
commit 205a538df3
5 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala
View file

@ -1154,8 +1154,8 @@ class SubSource[+Out, +Mat](delegate: scaladsl.SubFlow[Out, Mat, scaladsl.Source
*
* '''Cancels when''' downstream cancels
*/
def zip[T](source: Graph[SourceShape[T], _]): SubSource[Out @uncheckedVariance Pair T, Mat] =
new SubSource(delegate.zip(source))
def zip[T](source: Graph[SourceShape[T], _]): SubSource[akka.japi.Pair[Out @uncheckedVariance, T], Mat] =
new SubSource(delegate.zip(source).map { case (o, t) ⇒ akka.japi.Pair.create(o, t) })
/**
* Put together the elements of current [[Flow]] and the given [[Source]]