Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace non-binding if let statements #4735

Merged
merged 2 commits into from Jun 3, 2022
Merged

Replace non-binding if let statements #4735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93f9634
Replace non-binding `if let` statements
Jun 2, 2022
f9a30f8
Fix formatting
Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions tokio/src/sync/notify.rs
View file
Open in desktop
Expand Up @@ -501,7 +501,7 @@ impl Notify {
// transition out of WAITING while the lock is held.
let curr = self.state.load(SeqCst);

if let EMPTY | NOTIFIED = get_state(curr) {
if matches!(get_state(curr), EMPTY | NOTIFIED) {
// There are no waiting tasks. All we need to do is increment the
// number of times this method was called.
atomic_inc_num_notify_waiters_calls(&self.state);
Expand Down Expand Up @@ -896,7 +896,7 @@ impl Drop for Notified<'_> {
// This is where we ensure safety. The `Notified` value is being
// dropped, which means we must ensure that the waiter entry is no
// longer stored in the linked list.
if let Waiting = *state {
if matches!(*state, Waiting) {
djkoloski marked this conversation as resolved.
Show resolved Hide resolved
let mut waiters = notify.waiters.lock();
let mut notify_state = notify.state.load(SeqCst);

Expand All @@ -906,11 +906,9 @@ impl Drop for Notified<'_> {
// being the only `LinkedList` available to the type.
unsafe { waiters.remove(NonNull::new_unchecked(waiter.get())) };

if waiters.is_empty() {
if let WAITING = get_state(notify_state) {
notify_state = set_state(notify_state, EMPTY);
notify.state.store(notify_state, SeqCst);
}
if waiters.is_empty() && get_state(notify_state) == WAITING {
notify_state = set_state(notify_state, EMPTY);
notify.state.store(notify_state, SeqCst);
}

// See if the node was notified but not received. In this case, if
Expand All @@ -919,7 +917,10 @@ impl Drop for Notified<'_> {
//
// Safety: with the entry removed from the linked list, there can be
// no concurrent access to the entry
if let Some(NotificationType::OneWaiter) = unsafe { (*waiter.get()).notified } {
if matches!(
unsafe { (*waiter.get()).notified },
Some(NotificationType::OneWaiter)
) {
if let Some(waker) = notify_locked(&mut waiters, &notify.state, notify_state) {
drop(waiters);
waker.wake();
Expand Down