fix Stream::throttle hot loop (async-rs#584)

yoshuawuyts · Stjepan Glavina · commit 68005661d9b8 · 2019-11-27T15:47:27.000+01:00
Signed-off-by: Yoshua Wuyts &lt;yoshuawuyts@gmail.com&gt;
diff --git a/src/stream/stream/mod.rs b/src/stream/stream/mod.rs
@@ -336,28 +336,19 @@ extension_trait! {
             let start = Instant::now();
 
             // emit value every 5 milliseconds
-            let s = stream::interval(Duration::from_millis(5))
-                .enumerate()
-                .take(3);
+            let s = stream::interval(Duration::from_millis(5)).take(2);
 
             // throttle for 10 milliseconds
             let mut s = s.throttle(Duration::from_millis(10));
 
-            assert_eq!(s.next().await, Some((0, ())));
-            let duration_ms = start.elapsed().as_millis();
-            assert!(duration_ms >= 5);
+            s.next().await;
+            assert!(start.elapsed().as_millis() >= 5);
 
-            assert_eq!(s.next().await, Some((1, ())));
-            let duration_ms = start.elapsed().as_millis();
-            assert!(duration_ms >= 15);
+            s.next().await;
+            assert!(start.elapsed().as_millis() >= 15);
 
-            assert_eq!(s.next().await, Some((2, ())));
-            let duration_ms = start.elapsed().as_millis();
-            assert!(duration_ms >= 25);
-
-            assert_eq!(s.next().await, None);
-            let duration_ms = start.elapsed().as_millis();
-            assert!(duration_ms >= 35);
+            s.next().await;
+            assert!(start.elapsed().as_millis() >= 35);
             #
             # }) }
             ```
diff --git a/src/stream/stream/throttle.rs b/src/stream/stream/throttle.rs
@@ -55,10 +55,7 @@ impl<S: Stream> Stream for Throttle<S> {
         }
 
         match this.stream.poll_next(cx) {
-            Poll::Pending => {
-                cx.waker().wake_by_ref(); // Continue driving even though emitting Pending
-                Poll::Pending
-            }
+            Poll::Pending => Poll::Pending,
             Poll::Ready(None) => Poll::Ready(None),
             Poll::Ready(Some(v)) => {
                 *this.blocked = true;
