bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make duration_since use checked_duration_since

Browse source
This commit is contained in:
Linus Färnstrand 2019-03-22 22:12:32 +01:00
parent 37cfeb2710
commit d56b1fd0e7
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/time.rs
View file

@ -212,7 +212,7 @@ impl Instant {
/// ``` /// ```
#[stable(feature = "time2", since = "1.8.0")] #[stable(feature = "time2", since = "1.8.0")]
pub fn duration_since(&self, earlier: Instant) -> Duration { pub fn duration_since(&self, earlier: Instant) -> Duration {
self.0.sub_instant(&earlier.0) self.0.checked_sub_instant(&earlier.0).expect("supplied instant is later than self")
} }
/// Returns the amount of time elapsed from another instant to this one, /// Returns the amount of time elapsed from another instant to this one,
@ -233,11 +233,7 @@ impl Instant {
/// ``` /// ```
#[unstable(feature = "checked_duration_since", issue = "58402")] #[unstable(feature = "checked_duration_since", issue = "58402")]
pub fn checked_duration_since(&self, earlier: Instant) -> Option<Duration> { pub fn checked_duration_since(&self, earlier: Instant) -> Option<Duration> {
if self >= &earlier { self.0.checked_sub_instant(&earlier.0)
Some(self.0.sub_instant(&earlier.0))
} else {
None
}
} }
/// Returns the amount of time elapsed from another instant to this one, /// Returns the amount of time elapsed from another instant to this one,