Skip to content

Commit

Permalink
Fix incorrect assumption (rust-lang#2606)
Browse files Browse the repository at this point in the history
  • Loading branch information
olegnn committed Mar 11, 2023
1 parent 50b64f2 commit 555701e
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions futures-util/src/stream/stream/flatten_unordered.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@ impl SharedPollState {
})
.ok()?;

debug_assert!(value & WAKING == NONE);

// Only start the waking process if we're not in the polling phase and the stream isn't woken already
if value & (WOKEN | POLLING) == NONE {
// Only start the waking process if we're not in the polling/waking phase and the stream isn't woken already
if value & (WOKEN | POLLING | WAKING) == NONE {
let bomb = PollStateBomb::new(self, SharedPollState::stop_waking);

Some((value, bomb))
Expand Down Expand Up @@ -236,7 +234,7 @@ impl ArcWake for WrappedWaker {
}

pin_project! {
/// Future which contains optional stream.
/// Future which polls optional inner stream.
///
/// If it's `Some`, it will attempt to call `poll_next` on it,
/// returning `Some((item, next_item_fut))` in case of `Poll::Ready(Some(...))`
Expand Down

0 comments on commit 555701e

Please sign in to comment.