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

time: clean up redundant check in Wheel::poll() #5574

Merged
merged 2 commits into from Mar 23, 2023
Merged

time: clean up redundant check in Wheel::poll() #5574

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279381a
time: clean up redundant check in Wheel::poll()
marcelo-gonzalez Mar 22, 2023
fdd9b6f
fix match statement arms
marcelo-gonzalez Mar 22, 2023
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
16 changes: 3 additions & 13 deletions tokio/src/runtime/time/wheel/mod.rs
View file
Open in desktop
Expand Up @@ -148,23 +148,13 @@ impl Wheel {
return Some(handle);
}

// under what circumstances is poll.expiration Some vs. None?
let expiration = self.next_expiration().and_then(|expiration| {
if expiration.deadline > now {
None
} else {
Some(expiration)
}
});

match expiration {
Some(ref expiration) if expiration.deadline > now => return None,
Some(ref expiration) => {
match self.next_expiration() {
Some(ref expiration) if expiration.deadline <= now => {
self.process_expiration(expiration);

self.set_elapsed(expiration.deadline);
}
None => {
_ => {
// in this case the poll did not indicate an expiration
// _and_ we were not able to find a next expiration in
// the current list of timers. advance to the poll's
Expand Down