rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Makes the constructors of Duration const fns.

Browse Source
This commit is contained in:
Nathaniel Ringo
2018-01-09 14:21:45 -06:00
parent 61452e506f
commit 2624c05acf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/time/duration.rs
View File

@@ -73,7 +73,7 @@ impl Duration {
/// ``` /// ```
#[stable(feature = "duration", since = "1.3.0")] #[stable(feature = "duration", since = "1.3.0")]
#[inline] #[inline]
pub fn new(secs: u64, nanos: u32) -> Duration { pub const fn new(secs: u64, nanos: u32) -> Duration {
let secs = secs.checked_add((nanos / NANOS_PER_SEC) as u64) let secs = secs.checked_add((nanos / NANOS_PER_SEC) as u64)
.expect("overflow in Duration::new"); .expect("overflow in Duration::new");
let nanos = nanos % NANOS_PER_SEC; let nanos = nanos % NANOS_PER_SEC;
@@ -94,7 +94,7 @@ impl Duration {
/// ``` /// ```
#[stable(feature = "duration", since = "1.3.0")] #[stable(feature = "duration", since = "1.3.0")]
#[inline] #[inline]
pub fn from_secs(secs: u64) -> Duration { pub const fn from_secs(secs: u64) -> Duration {
Duration { secs: secs, nanos: 0 } Duration { secs: secs, nanos: 0 }
} }
@@ -112,7 +112,7 @@ impl Duration {
/// ``` /// ```
#[stable(feature = "duration", since = "1.3.0")] #[stable(feature = "duration", since = "1.3.0")]
#[inline] #[inline]
pub fn from_millis(millis: u64) -> Duration { pub const fn from_millis(millis: u64) -> Duration {
let secs = millis / MILLIS_PER_SEC; let secs = millis / MILLIS_PER_SEC;
let nanos = ((millis % MILLIS_PER_SEC) as u32) * NANOS_PER_MILLI; let nanos = ((millis % MILLIS_PER_SEC) as u32) * NANOS_PER_MILLI;
Duration { secs: secs, nanos: nanos } Duration { secs: secs, nanos: nanos }
@@ -133,7 +133,7 @@ impl Duration {
/// ``` /// ```
#[unstable(feature = "duration_from_micros", issue = "44400")] #[unstable(feature = "duration_from_micros", issue = "44400")]
#[inline] #[inline]
pub fn from_micros(micros: u64) -> Duration { pub const fn from_micros(micros: u64) -> Duration {
let secs = micros / MICROS_PER_SEC; let secs = micros / MICROS_PER_SEC;
let nanos = ((micros % MICROS_PER_SEC) as u32) * NANOS_PER_MICRO; let nanos = ((micros % MICROS_PER_SEC) as u32) * NANOS_PER_MICRO;
Duration { secs: secs, nanos: nanos } Duration { secs: secs, nanos: nanos }
@@ -154,7 +154,7 @@ impl Duration {
/// ``` /// ```
#[unstable(feature = "duration_extras", issue = "46507")] #[unstable(feature = "duration_extras", issue = "46507")]
#[inline] #[inline]
pub fn from_nanos(nanos: u64) -> Duration { pub const fn from_nanos(nanos: u64) -> Duration {
let secs = nanos / (NANOS_PER_SEC as u64); let secs = nanos / (NANOS_PER_SEC as u64);
let nanos = (nanos % (NANOS_PER_SEC as u64)) as u32; let nanos = (nanos % (NANOS_PER_SEC as u64)) as u32;
Duration { secs: secs, nanos: nanos } Duration { secs: secs, nanos: nanos }