Fix pretty big bug

rust-lang · Nov 20, 2020 · b3b3271 · b3b3271
1 parent 8d7ba2a
commit b3b3271
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/futures-macro/src/stream_select.rs b/futures-macro/src/stream_select.rs
@@ -54,19 +54,23 @@ pub(crate) fn stream_select(input: TokenStream) -> TokenStream {
                     let Self(#(ref mut #field_idents),*) = self.get_mut();
                     let mut future_array = [#(StreamFutures::#generic_idents(#field_idents.next())),*];
                     __futures_crate::async_await::shuffle(&mut future_array);
-                    let mut any_polled = false;
+                    let mut any_pending = false;
                     for f in &mut future_array {
                         if __futures_crate::future::FusedFuture::is_terminated(f) {
                             continue;
                         } else {
-                            any_polled = true;
-                            let r = __futures_crate::future::Future::poll(::std::pin::Pin::new(f), cx);
-                            if r.is_ready() {
-                                return r;
+                            match __futures_crate::future::Future::poll(::std::pin::Pin::new(f), cx) {
+                                r @ __futures_crate::task::Poll::Ready(Some(_)) => {
+                                    return r;
+                                },
+                                __futures_crate::task::Poll::Pending => {
+                                    any_pending = true;
+                                },
+                                __futures_crate::task::Poll::Ready(None) => {},
                             }
                         }
                     }
-                    if any_polled {
+                    if any_pending {
                         __futures_crate::task::Poll::Pending
                     } else {
                         __futures_crate::task::Poll::Ready(None)