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

Merge pull request #19750 from lolski/lolski-issue-19293-rebased

Browse source 
=str #19293 fix issues in Sink.seq + minor doc fixes + use Sink.seq
This commit is contained in:
drewhk 2016-02-12 11:36:56 +01:00
commit ebb915ae4d
46 changed files with 330 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

22
akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala
View file

@ -656,16 +656,15 @@ trait FlowOps[+Out, +Mat] {
* requested from upstream publishers that will then not be processed downstream
* of this step.
*
* The stream will be completed without producing any elements if `n` is zero
* or negative.
*
* '''Emits when''' the specified number of elements to take has not yet been reached
* '''Emits when''' upstream emits and the number of emitted elements has not reached max
*
* '''Backpressures when''' downstream backpressures
*
* '''Completes when''' the defined number of elements has been taken or upstream completes
* '''Completes when''' upstream completes and the number of emitted elements has not reached max
*
* '''Cancels when''' the defined number of elements has been taken or downstream cancels
* '''Errors when''' the total number of incoming element exceeds max
*
* '''Cancels when''' downstream cancels
*
* See also [[FlowOps.take]], [[FlowOps.takeWithin]], [[FlowOps.takeWhile]]
*/
@ -681,16 +680,15 @@ trait FlowOps[+Out, +Mat] {
* requested from upstream publishers that will then not be processed downstream
* of this step.
*
* The stream will be completed without producing any elements if `n` is zero
* or negative.
*
* '''Emits when''' the specified number of elements to take has not yet been reached
* '''Emits when''' upstream emits and the accumulated cost has not reached max
*
* '''Backpressures when''' downstream backpressures
*
* '''Completes when''' the defined number of elements has been taken or upstream completes
* '''Completes when''' upstream completes and the number of emitted elements has not reached max
*
* '''Cancels when''' the defined number of elements has been taken or downstream cancels
* '''Errors when''' when the accumulated cost exceeds max
*
* '''Cancels when''' downstream cancels
*
* See also [[FlowOps.take]], [[FlowOps.takeWithin]], [[FlowOps.takeWhile]]
*/