clean up listener @ None patterns

smol-rs · May 26, 2023 · ebe85d9 · ebe85d9
1 parent f675c23
commit ebe85d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/mutex.rs b/src/mutex.rs
@@ -421,9 +421,9 @@ impl<T: ?Sized, B: Unpin + Borrow<Mutex<T>>> Future for AcquireSlow<B, T> {
             loop {
                 // Start listening for events.
                 match &mut this.listener {
-                    listener @ None => {
+                    None => {
                         // Start listening for events.
-                        *listener = Some(mutex.lock_ops.listen());
+                        this.listener = Some(mutex.lock_ops.listen());
 
                         // Try locking if nobody is being starved.
                         match mutex
@@ -490,9 +490,9 @@ impl<T: ?Sized, B: Unpin + Borrow<Mutex<T>>> Future for AcquireSlow<B, T> {
         // Fairer locking loop.
         loop {
             match &mut this.listener {
-                listener @ None => {
+                None => {
                     // Start listening for events.
-                    *listener = Some(mutex.lock_ops.listen());
+                    this.listener = Some(mutex.lock_ops.listen());
 
                     // Try locking if nobody else is being starved.
                     match mutex

diff --git a/src/rwlock.rs b/src/rwlock.rs
@@ -426,8 +426,8 @@ impl<'a, T: ?Sized> Future for Read<'a, T> {
             } else {
                 // Start listening for "no writer" events.
                 let load_ordering = match &mut this.listener {
-                    listener @ None => {
-                        *listener = Some(this.lock.no_writer.listen());
+                    None => {
+                        this.listener = Some(this.lock.no_writer.listen());
 
                         // Make sure there really is no writer.
                         Ordering::SeqCst
@@ -823,9 +823,9 @@ impl<'a, T: ?Sized> Future for Upgrade<'a, T> {
 
             // If there are readers, wait for them to finish.
             match &mut this.listener {
-                listener @ None => {
+                None => {
                     // Start listening for "no readers" events.
-                    *listener = Some(guard.writer.0.no_readers.listen());
+                    this.listener = Some(guard.writer.0.no_readers.listen());
                 }
 
                 Some(ref mut listener) => {

diff --git a/src/semaphore.rs b/src/semaphore.rs
@@ -183,8 +183,8 @@ impl<'a> Future for Acquire<'a> {
                 None => {
                     // Wait on the listener.
                     match &mut this.listener {
-                        listener @ None => {
-                            *listener = Some(this.semaphore.event.listen());
+                        None => {
+                            this.listener = Some(this.semaphore.event.listen());
                         }
                         Some(ref mut listener) => {
                             ready!(Pin::new(listener).poll(cx));
@@ -229,8 +229,8 @@ impl Future for AcquireArc {
                 None => {
                     // Wait on the listener.
                     match &mut this.listener {
-                        listener @ None => {
-                            *listener = Some(this.semaphore.event.listen());
+                        None => {
+                            this.listener = Some(this.semaphore.event.listen());
                         }
                         Some(ref mut listener) => {
                             ready!(Pin::new(listener).poll(cx));