diff options
| author | bors <bors@rust-lang.org> | 2019-01-07 17:01:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-07 17:01:25 +0000 |
| commit | 59e70f27756a57b16a48bd7262e67fda01744701 (patch) | |
| tree | 7f675c297ac8a6f82586cc6f2a1d63b7b0346d64 /src/libstd | |
| parent | 21ac19d8fefb023752645fcf2517ce0fad663bf0 (diff) | |
| parent | 6031f1302b66da2e86f331d5202435607c54f256 (diff) | |
| download | rust-59e70f27756a57b16a48bd7262e67fda01744701.tar.gz rust-59e70f27756a57b16a48bd7262e67fda01744701.zip | |
Auto merge of #57405 - pietroalbini:rollup, r=pietroalbini
Rollup of 6 pull requests Successful merges: - #57290 (remove outdated comment) - #57308 (Make CompileController thread-safe) - #57358 (use utf-8 throughout htmldocck) - #57369 (Provide the option to use libc++ even on all platforms) - #57375 (Add duration constants) - #57403 (Make extern ref HTTPS) Failed merges: - #57370 (Support passing cflags/cxxflags/ldflags to LLVM build) r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/time.rs | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index d42e39f16e6..ccfce672e5f 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -248,6 +248,7 @@ #![feature(const_cstr_unchecked)] #![feature(core_intrinsics)] #![feature(dropck_eyepatch)] +#![feature(duration_constants)] #![feature(exact_size_is_empty)] #![feature(external_doc)] #![feature(fixed_size_array)] diff --git a/src/libstd/time.rs b/src/libstd/time.rs index eb67b718dbd..3daad7db2de 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -21,6 +21,9 @@ use sys_common::FromInner; #[stable(feature = "time", since = "1.3.0")] pub use core::time::Duration; +#[unstable(feature = "duration_constants", issue = "57391")] +pub use core::time::{SECOND, MILLISECOND, MICROSECOND, NANOSECOND}; + /// A measurement of a monotonically nondecreasing clock. /// Opaque and useful only with `Duration`. /// |