diff options
| -rw-r--r-- | src/libstd/sys/unix/time.rs | 2 | ||||
| -rw-r--r-- | src/libstd/time/mod.rs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs index 75319ce962c..cc026b8fd10 100644 --- a/src/libstd/sys/unix/time.rs +++ b/src/libstd/sys/unix/time.rs @@ -330,7 +330,7 @@ mod inner { // Nano calculations can't overflow because nanos are <1B which fit // in a u32. let mut nsec = other.subsec_nanos() + self.t.tv_nsec as u32; - if nsec > NSEC_PER_SEC as u32 { + if nsec >= NSEC_PER_SEC as u32 { nsec -= NSEC_PER_SEC as u32; secs = secs.checked_add(1).expect("overflow when adding \ duration to time"); diff --git a/src/libstd/time/mod.rs b/src/libstd/time/mod.rs index d400d12e23f..1781461e3e3 100644 --- a/src/libstd/time/mod.rs +++ b/src/libstd/time/mod.rs @@ -303,6 +303,10 @@ mod tests { let eighty_years = second * 60 * 60 * 24 * 365 * 80; assert_almost_eq!(a - eighty_years + eighty_years, a); assert_almost_eq!(a - (eighty_years * 10) + (eighty_years * 10), a); + + let one_second_from_epoch = UNIX_EPOCH + Duration::new(1, 0); + let one_second_from_epoch2 = UNIX_EPOCH + Duration::new(0, 999_999_999) + Duration::new(0, 1); + assert_eq!(one_second_from_epoch, one_second_from_epoch2); } #[test] |