Move set waker = None to the waking thread (mpmc preparation)

Author: Restioson

src/async.rs

@@ -33,14 +33,15 @@ impl<'a, T> Future for RecvFuture<'a, T> {
                 .recv
                 .shared
                 .poll_inner()
-                .map(|mut inner| self
+                .map(|inner| self
                     .recv
                     .shared
-                    .try_recv(move || {
-                        // Detach the waker
-                        inner.recv_waker = None;
-                        inner
-                    }, &mut buf, self.recv.mpmc_mode.get()))
+                    .try_recv(
+                        move || inner,
+                        &mut buf,
+                        self.recv.mpmc_mode.get()
+                    )
+                )
         };
 
         let poll = match res {

src/lib.rs

@@ -286,6 +286,7 @@ impl<T> Shared<T> {
             // Notify the receiving async task
             if let Some(recv_waker) = &inner.recv_waker {
                 recv_waker.wake_by_ref();
+                inner.recv_waker = None;
             }
         }
 
@@ -332,8 +333,10 @@ impl<T> Shared<T> {
         self.send_signal.notify_all(self.inner.lock());
         #[cfg(feature = "async")]
         {
-            if let Some(recv_waker) = &self.lock_inner().recv_waker {
+            let mut inner = self.lock_inner();
+            if let Some(recv_waker) = &inner.recv_waker {
                 recv_waker.wake_by_ref();
+                inner.recv_waker = None;
             }
         }
     }