Auto merge of #33072 - tbu-:pr_duration_new_overflow, r=alexcrichton
Panic on overflow in `Duration::new` constructor Panicking on overflow is also done for `+`, and it replaces the currently incorrect overflow behavior of wrapping around, which does not make sense for `Duration`s.
This commit is contained in:
commit
6301e22e15
@ -51,10 +51,16 @@ impl Duration {
|
||||
///
|
||||
/// If the nanoseconds is greater than 1 billion (the number of nanoseconds
|
||||
/// in a second), then it will carry over into the seconds provided.
|
||||
///
|
||||
/// # Panics
|
||||
///
|
||||
/// This constructor will panic if the carry from the nanoseconds overflows
|
||||
/// the seconds counter.
|
||||
#[stable(feature = "duration", since = "1.3.0")]
|
||||
#[inline]
|
||||
pub fn new(secs: u64, nanos: u32) -> Duration {
|
||||
let secs = secs + (nanos / NANOS_PER_SEC) as u64;
|
||||
let secs = secs.checked_add((nanos / NANOS_PER_SEC) as u64)
|
||||
.expect("overflow in Duration::new");
|
||||
let nanos = nanos % NANOS_PER_SEC;
|
||||
Duration { secs: secs, nanos: nanos }
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user