Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions futures-util/src/stream/select_all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ impl<St: Stream + Unpin> SelectAll<St> {
pub fn iter_pin_mut(self: Pin<&mut Self>) -> IterPinMut<'_, StreamFuture<St>> {
self.project().inner.iter_pin_mut()
}

/// Clears the set, removing all futures.
pub fn clear(&mut self) {
self.inner.clear()
}
}

impl<St: Stream + Unpin> Default for SelectAll<St> {
Expand Down
25 changes: 24 additions & 1 deletion futures/tests/stream_select_all.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use futures::channel::mpsc;
use futures::executor::block_on_stream;
use futures::executor::{block_on, block_on_stream};
use futures::future::{self, FutureExt};
use futures::stream::{self, select_all, FusedStream, SelectAll, StreamExt};
use futures::task::Poll;
Expand Down Expand Up @@ -76,3 +76,26 @@ fn works_1() {
drop((a_tx, b_tx, c_tx));
assert_eq!(None, stream.next());
}

#[test]
fn clear() {
let mut tasks =
select_all(vec![stream::iter(vec![1].into_iter()), stream::iter(vec![2].into_iter())]);

assert_eq!(block_on(tasks.next()), Some(1));
assert!(!tasks.is_empty());

tasks.clear();
assert!(tasks.is_empty());

tasks.push(stream::iter(vec![3].into_iter()));
assert!(!tasks.is_empty());

tasks.clear();
assert!(tasks.is_empty());

assert_eq!(block_on(tasks.next()), None);
assert!(tasks.is_terminated());
tasks.clear();
assert!(!tasks.is_terminated());
}