itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-09-28 21:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

add secs_nanos function to support total nanoseconds > max i64 in constructor (#426)

Browse Source
This commit is contained in:
Sean Loiselle 2020-06-21 10:25:22 -04:00 committed by GitHub
parent ce62f917b7
commit 9ad1956cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/oldtime.rs
View File

@ -132,6 +132,19 @@ impl Duration {
Duration { secs: secs, nanos: nanos as i32 } Duration { secs: secs, nanos: nanos as i32 }
} }
/// Makes a new `Duration` with the given number of seconds and nanoseconds.
///
/// `nanos` in excess of `999_999_999` are carried over into seconds.
#[inline]
pub fn seconds_nanos(secs: i64, nanos: i32) -> Duration {
let (secs_from_nanos, nanos) = div_mod_floor_64(nanos, NANOS_PER_SEC as i64);
let d = Duration { secs: secs + secs_from_nanos, nanos }
if d < MIN || d > MAX {
panic!("Duration::seconds out of bounds");
}
d
}
/// Returns the total number of whole weeks in the duration. /// Returns the total number of whole weeks in the duration.
#[inline] #[inline]
pub fn num_weeks(&self) -> i64 { pub fn num_weeks(&self) -> i64 {
@ -617,6 +630,7 @@ mod tests {
fn test_to_std() { fn test_to_std() {
assert_eq!(Duration::seconds(1).to_std(), Ok(StdDuration::new(1, 0))); assert_eq!(Duration::seconds(1).to_std(), Ok(StdDuration::new(1, 0)));
assert_eq!(Duration::seconds(86401).to_std(), Ok(StdDuration::new(86401, 0))); assert_eq!(Duration::seconds(86401).to_std(), Ok(StdDuration::new(86401, 0)));
assert_eq!(Duration::secs_nanos(86401, 86401).to_std(), Ok(StdDuration::new(86401, 86401)));
assert_eq!(Duration::milliseconds(123).to_std(), Ok(StdDuration::new(0, 123000000))); assert_eq!(Duration::milliseconds(123).to_std(), Ok(StdDuration::new(0, 123000000)));
assert_eq!(Duration::milliseconds(123765).to_std(), Ok(StdDuration::new(123, 765000000))); assert_eq!(Duration::milliseconds(123765).to_std(), Ok(StdDuration::new(123, 765000000)));
assert_eq!(Duration::nanoseconds(777).to_std(), Ok(StdDuration::new(0, 777))); assert_eq!(Duration::nanoseconds(777).to_std(), Ok(StdDuration::new(0, 777)));