From dfab15ed781fd780146d7592d4e0a86d6c31b4cc Mon Sep 17 00:00:00 2001 From: Per Lindgren Date: Mon, 18 Nov 2019 16:36:17 +0100 Subject: Fixed internal overflow on subtraiton in elapsed and duration --- src/cyccnt.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cyccnt.rs b/src/cyccnt.rs index 86969cb..338bbbe 100644 --- a/src/cyccnt.rs +++ b/src/cyccnt.rs @@ -38,12 +38,14 @@ impl Instant { /// Returns the amount of time elapsed since this instant was created. pub fn elapsed(&self) -> Duration { - Instant::now() - *self + let diff = Instant::now().inner.wrapping_sub(self.inner); + assert!(diff >= 0, "instant now is earlier than self"); + Duration { inner: diff as u32 } } /// Returns the amount of time elapsed from another instant to this one. pub fn duration_since(&self, earlier: Instant) -> Duration { - let diff = self.inner - earlier.inner; + let diff = self.inner.wrapping_sub(earlier.inner); assert!(diff >= 0, "second instant is later than self"); Duration { inner: diff as u32 } } -- cgit v1.2.3