Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ impl Timer {
None => {
// Overflow to never going off.
self.clear();
self.when = None;
}
}
}
Expand Down Expand Up @@ -405,7 +404,6 @@ impl Timer {
None => {
// Overflow to never going off.
self.clear();
self.when = None;
}
}
}
Expand Down Expand Up @@ -443,12 +441,13 @@ impl Timer {
}
}

/// Helper function to clear the current timer.
fn clear(&mut self) {
/// Clear any timeouts set on this timer. It will never fire again until a new interval or instant is set.
pub fn clear(&mut self) {
if let (Some(when), Some((id, _))) = (self.when, self.id_and_waker.as_ref()) {
// Deregister the timer from the reactor.
Reactor::get().remove_timer(when, *id);
}
self.when = None;
}
}

Expand Down
Loading