Skip to content

Commit 62fb0db

Browse files
committed
Auto merge of #119863 - tmiasko:will-wake, r=m-ou-se
Waker::will_wake: Compare vtable address instead of its content Optimize will_wake implementation by comparing vtable address instead of its content. The existing best practice to avoid false negatives from will_wake is to define a waker vtable as a static item. That approach continues to works with the new implementation. While this potentially changes the observable behaviour, the function is documented to work on a best-effort basis. The PartialEq impl for RawWaker remains as it was.
2 parents fa9f77f + 9d84589 commit 62fb0db

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

library/core/src/task/wake.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,9 @@ impl Waker {
441441
#[must_use]
442442
#[stable(feature = "futures_api", since = "1.36.0")]
443443
pub fn will_wake(&self, other: &Waker) -> bool {
444-
self.waker == other.waker
444+
let RawWaker { data: a_data, vtable: a_vtable } = self.waker;
445+
let RawWaker { data: b_data, vtable: b_vtable } = other.waker;
446+
a_data == b_data && ptr::eq(a_vtable, b_vtable)
445447
}
446448

447449
/// Creates a new `Waker` from [`RawWaker`].

0 commit comments

Comments
 (0)