Skip to content

Commit

Permalink
Auto merge of #47300 - remexre:duration-constructors-as-const-fns, r=…
Browse files Browse the repository at this point in the history
…alexcrichton

Makes the constructors of Duration const fns.

This affects `Duration::new`, `Duration::from_secs`, `Duration::from_millis`, `Duration::from_micros`, and `Duration::from_nanos`.
  • Loading branch information
bors committed Jan 24, 2018
2 parents 9758ff9 + c25178c commit a0dcecf
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions src/libstd/time/duration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl Duration {
/// ```
#[stable(feature = "duration", since = "1.3.0")]
#[inline]
pub fn from_secs(secs: u64) -> Duration {
pub const fn from_secs(secs: u64) -> Duration {
Duration { secs: secs, nanos: 0 }
}

Expand All @@ -112,10 +112,11 @@ impl Duration {
/// ```
#[stable(feature = "duration", since = "1.3.0")]
#[inline]
pub fn from_millis(millis: u64) -> Duration {
let secs = millis / MILLIS_PER_SEC;
let nanos = ((millis % MILLIS_PER_SEC) as u32) * NANOS_PER_MILLI;
Duration { secs: secs, nanos: nanos }
pub const fn from_millis(millis: u64) -> Duration {
Duration {
secs: millis / MILLIS_PER_SEC,
nanos: ((millis % MILLIS_PER_SEC) as u32) * NANOS_PER_MILLI,
}
}

/// Creates a new `Duration` from the specified number of microseconds.
Expand All @@ -133,10 +134,11 @@ impl Duration {
/// ```
#[unstable(feature = "duration_from_micros", issue = "44400")]
#[inline]
pub fn from_micros(micros: u64) -> Duration {
let secs = micros / MICROS_PER_SEC;
let nanos = ((micros % MICROS_PER_SEC) as u32) * NANOS_PER_MICRO;
Duration { secs: secs, nanos: nanos }
pub const fn from_micros(micros: u64) -> Duration {
Duration {
secs: micros / MICROS_PER_SEC,
nanos: ((micros % MICROS_PER_SEC) as u32) * NANOS_PER_MICRO,
}
}

/// Creates a new `Duration` from the specified number of nanoseconds.
Expand All @@ -154,10 +156,11 @@ impl Duration {
/// ```
#[unstable(feature = "duration_extras", issue = "46507")]
#[inline]
pub fn from_nanos(nanos: u64) -> Duration {
let secs = nanos / (NANOS_PER_SEC as u64);
let nanos = (nanos % (NANOS_PER_SEC as u64)) as u32;
Duration { secs: secs, nanos: nanos }
pub const fn from_nanos(nanos: u64) -> Duration {
Duration {
secs: nanos / (NANOS_PER_SEC as u64),
nanos: (nanos % (NANOS_PER_SEC as u64)) as u32,
}
}

/// Returns the number of _whole_ seconds contained by this `Duration`.
Expand Down

0 comments on commit a0dcecf

Please sign in to comment.