Skip to content

Commit 06d1bd8

Browse files
committed
Merge branch 'wasm-support' of github.com:expenses/futures-timer into wasm-support
2 parents ef8a441 + 511b0a1 commit 06d1bd8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/delay.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl Delay {
6868
/// Resets this timeout to an new timeout which will fire at the time
6969
/// specified by `at`.
7070
#[inline]
71-
pub fn reset(&mut self, delay: Duration) {
71+
pub fn reset(&mut self, dur: Duration) {
7272
if self._reset(delay).is_err() {
7373
self.state = None
7474
}

src/delay_wasm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ impl Delay {
2020
Self(SendWrapper::new(TimeoutFuture::new(dur.as_millis() as u32)))
2121
}
2222

23-
/// Resets the timeout. Panics on wasm.
23+
/// Resets the timeout.
2424
#[inline]
25-
pub fn reset(&mut self, at: Duration) {
25+
pub fn reset(&mut self, dur: Duration) {
2626
*self = Delay::new(at);
2727
}
2828
}

0 commit comments

Comments
 (0)