Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Duration::from_micros #44436

Merged
merged 6 commits into from
Sep 24, 2017
Merged

Add Duration::from_micros #44436

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4db499f
Add Duration::from_micros
gagath Sep 8, 2017
376837b
from_micros: Inlined return for consistency
gagath Sep 9, 2017
2e6aed8
from_micros: Added unstable annotation
gagath Sep 9, 2017
abc53cc
from_micros: Fix missing {
gagath Sep 9, 2017
a15c541
from_micros: added issue number and fixed typo
gagath Sep 10, 2017
b40a9f4
from_micros: add feature name
gagath Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/libstd/time/duration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ use ops::{Add, Sub, Mul, Div, AddAssign, SubAssign, MulAssign, DivAssign};

const NANOS_PER_SEC: u32 = 1_000_000_000;
const NANOS_PER_MILLI: u32 = 1_000_000;
const NANOS_PER_MICRO: u32 = 1_000;
const MILLIS_PER_SEC: u64 = 1_000;
const MICROS_PER_SEC: u64 = 1_000_000;

/// A `Duration` type to represent a span of time, typically used for system
/// timeouts.
Expand Down Expand Up @@ -116,6 +118,26 @@ impl Duration {
Duration { secs: secs, nanos: nanos }
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You missed a } here.

/// Creates a new `Duration` from the specified number of microseconds.
///
/// # Examples
///
/// ```
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test will need to enable that feature to build properly.

/// use std::time::Duration;
///
/// let duration = Duration::from_micros(1_000_002);
///
/// assert_eq!(1, duration.as_secs());
/// assert_eq!(2000, duration.subsec_nanos());
/// ```
#[unstable(feature = "", issue = "44400")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The feature can be called whatever you want duration_from_micros is probably fine.

#[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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo. Also, the issue must be a number.

[00:02:49] error[E0425]: cannot find value `NANOS_PER_MICRO` in this scope
[00:02:49]    --> /checkout/src/libstd/time/duration.rs:137:58
[00:02:49]     |
[00:02:49] 137 |         let nanos = ((micros % MICROS_PER_SEC) as u32) * NANOS_PER_MICRO;
[00:02:49]     |                                                          ^^^^^^^^^^^^^^^ did you mean `NANOS_PER_MICROS`?
[00:02:49] 
[00:02:49] error[E0545]: incorrect 'issue'
[00:02:49]    --> /checkout/src/libstd/time/duration.rs:133:5
[00:02:49]     |
[00:02:49] 133 |     #[unstable(feature = "", issue = "")]
[00:02:49]     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[00:02:49] 
[00:02:51] error: aborting due to 2 previous errors
[00:02:51] 
[00:02:51] error: Could not compile `std`.

Duration { secs: secs, nanos: nanos }
}

/// Returns the number of _whole_ seconds contained by this `Duration`.
///
/// The returned value does not include the fractional (nanosecond) part of the
Expand Down