This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(extract
timestamp_checked_add
as lib)
- Loading branch information
Showing
12 changed files
with
123 additions
and
42 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[package] | ||
name = "time-utils" | ||
version = "0.1.0" | ||
authors = ["Parity Technologies <admin@parity.io>"] | ||
description = "Time utilities for checked arithmetic" | ||
license = "GPL3" | ||
edition = "2018" | ||
|
||
[dependencies] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
use std::time::{Duration, SystemTime, UNIX_EPOCH}; | ||
|
||
/// Temporary trait for `SystemTime::checked_add` until `Rust 1.33` is available | ||
pub trait CheckedSystemTime { | ||
/// Returns `Some<SystemTime>` when the result less or equal to `i32::max_value` to prevent `SystemTime` to panic because | ||
/// it is platform specific, possible representations are i32, i64, u64 and Duration. `None` otherwise | ||
fn checked_add(self, _d: Duration) -> Option<SystemTime>; | ||
/// Returns `Some<SystemTime>` when the result is successful and `None` when it is not | ||
fn checked_sub(self, _d: Duration) -> Option<SystemTime>; | ||
} | ||
|
||
impl CheckedSystemTime for SystemTime { | ||
fn checked_add(self, dur: Duration) -> Option<SystemTime> { | ||
let this_dur = self.duration_since(UNIX_EPOCH).ok()?; | ||
let total_time = this_dur.checked_add(dur)?; | ||
|
||
if total_time.as_secs() <= i32::max_value() as u64 { | ||
Some(self + dur) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
fn checked_sub(self, dur: Duration) -> Option<SystemTime> { | ||
let this_dur = self.duration_since(UNIX_EPOCH).ok()?; | ||
let total_time = this_dur.checked_sub(dur)?; | ||
|
||
if total_time.as_secs() <= i32::max_value() as u64 { | ||
Some(self - dur) | ||
} else { | ||
None | ||
} | ||
} | ||
} | ||
|
||
/// Temporary trait for `Duration::as_millis` until `Rust 1.33` is available | ||
pub trait AsMillis { | ||
/// Duration represented as milliseconds | ||
fn as_millis(&self) -> u128; | ||
} | ||
|
||
impl AsMillis for Duration { | ||
fn as_millis(&self) -> u128 { | ||
self.as_secs() as u128 * 1_000 + (self.subsec_nanos() / 1_000_000) as u128 | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
#[test] | ||
fn it_works() { | ||
use super::CheckedSystemTime; | ||
use std::time::{Duration, SystemTime, UNIX_EPOCH}; | ||
|
||
assert!(CheckedSystemTime::checked_add(UNIX_EPOCH, Duration::new(i32::max_value() as u64 + 1, 0)).is_none()); | ||
assert!(CheckedSystemTime::checked_add(UNIX_EPOCH, Duration::new(i32::max_value() as u64, 0)).is_some()); | ||
assert!(CheckedSystemTime::checked_add(UNIX_EPOCH, Duration::new(i32::max_value() as u64 - 1, 1_000_000_000)).is_some()); | ||
|
||
assert!(CheckedSystemTime::checked_sub(UNIX_EPOCH, Duration::from_secs(120)).is_none()); | ||
assert!(CheckedSystemTime::checked_sub(SystemTime::now(), Duration::from_secs(1000)).is_some()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters