mirror of
https://github.com/tokio-rs/tokio.git
synced 2025-10-01 12:20:39 +00:00
sync: fix will_wake
usage in Notify
(#4751)
This commit is contained in:
parent
bac7984417
commit
c7280167db
@ -856,7 +856,7 @@ impl Notified<'_> {
|
|||||||
// Update the waker, if necessary.
|
// Update the waker, if necessary.
|
||||||
if let Some(waker) = waker {
|
if let Some(waker) = waker {
|
||||||
let should_update = match w.waker.as_ref() {
|
let should_update = match w.waker.as_ref() {
|
||||||
Some(current_waker) => current_waker.will_wake(waker),
|
Some(current_waker) => !current_waker.will_wake(waker),
|
||||||
None => true,
|
None => true,
|
||||||
};
|
};
|
||||||
if should_update {
|
if should_update {
|
||||||
|
@ -207,3 +207,21 @@ fn test_enable_consumes_permit() {
|
|||||||
let mut future2 = spawn(notify.notified());
|
let mut future2 = spawn(notify.notified());
|
||||||
future2.enter(|_, fut| assert!(!fut.enable()));
|
future2.enter(|_, fut| assert!(!fut.enable()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_waker_update() {
|
||||||
|
use futures::task::noop_waker;
|
||||||
|
use std::future::Future;
|
||||||
|
use std::task::Context;
|
||||||
|
|
||||||
|
let notify = Notify::new();
|
||||||
|
let mut future = spawn(notify.notified());
|
||||||
|
|
||||||
|
let noop = noop_waker();
|
||||||
|
future.enter(|_, fut| assert_pending!(fut.poll(&mut Context::from_waker(&noop))));
|
||||||
|
|
||||||
|
assert_pending!(future.poll());
|
||||||
|
notify.notify_one();
|
||||||
|
|
||||||
|
assert!(future.is_woken());
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user