From 4d9bc51555ccb34dac38f3bdcc823282d9293f71 Mon Sep 17 00:00:00 2001
From: Nur <nurmohammed840@gmail.com>
Date: Mon, 2 Feb 2026 04:02:17 +0600
Subject: [PATCH] local-waker (perf): Avoid `Waker::clone` on 2nd registration
 (#783)

* local-waker (perf): Avoid `Waker::clone` on 2nd registration

* local-waker: Add safety docs

* Add safety note on `take`

---------

Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
---
 local-waker/src/lib.rs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/local-waker/src/lib.rs b/local-waker/src/lib.rs
index 6a6a5558..b131df84 100644
--- a/local-waker/src/lib.rs
+++ b/local-waker/src/lib.rs
@@ -6,7 +6,7 @@
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible, missing_docs)]
 
-use core::{cell::Cell, fmt, marker::PhantomData, task::Waker};
+use core::{cell::UnsafeCell, fmt, marker::PhantomData, task::Waker};
 
 /// A synchronization primitive for task wakeup.
 ///
@@ -27,7 +27,7 @@ use core::{cell::Cell, fmt, marker::PhantomData, task::Waker};
 /// [`wake`]: LocalWaker::wake
 #[derive(Default)]
 pub struct LocalWaker {
-    pub(crate) waker: Cell<Option<Waker>>,
+    pub(crate) waker: UnsafeCell<Option<Waker>>,
     // mark LocalWaker as a !Send type.
     _phantom: PhantomData<*const ()>,
 }
@@ -43,8 +43,21 @@ impl LocalWaker {
     /// Returns `true` if waker was registered before.
     #[inline]
     pub fn register(&self, waker: &Waker) -> bool {
-        let last_waker = self.waker.replace(Some(waker.clone()));
-        last_waker.is_some()
+        let mut registered = false;
+
+        // SAFETY: `LocalWaker` is `!Send`, threfore this cannot be called from a separate thread.
+        // And this is an unique access before the assignment below.
+        if let Some(prev) = unsafe { &*self.waker.get() } {
+            if waker.will_wake(prev) {
+                return true;
+            }
+            registered = true;
+        }
+
+        // SAFETY: This can cause data races if called from a separate thread,
+        // but `LocalWaker` is `!Send` + `!Sync` so this won't happen.
+        unsafe { *self.waker.get() = Some(waker.clone()) }
+        registered
     }
 
     /// Calls `wake` on the last `Waker` passed to `register`.
@@ -62,7 +75,9 @@ impl LocalWaker {
     /// If a waker has not been registered, this returns `None`.
     #[inline]
     pub fn take(&self) -> Option<Waker> {
-        self.waker.take()
+        // SAFETY: This can cause data races if called from a separate thread,
+        // but `LocalWaker` is `!Send` + `!Sync` so this won't happen.
+        unsafe { (*self.waker.get()).take() }
     }
 }