diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 18:16:08 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 18:16:08 -0700 |
| commit | 2a89bb6ba033b236c79a90486e2e3ee04d0e66f9 (patch) | |
| tree | ca1e1291bd28d3e725185b78295bcd2582b78ba3 | |
| parent | 32a5cebfbd80d85bd0f0fe0d344c8386eb4037e2 (diff) | |
| parent | f60244ead61fc1eed31468a741d92952740a70b0 (diff) | |
| download | rust-2a89bb6ba033b236c79a90486e2e3ee04d0e66f9.tar.gz rust-2a89bb6ba033b236c79a90486e2e3ee04d0e66f9.zip | |
Merge pull request #27680 from brson/beta-next
Fix breakage from previous cherry pick
| -rw-r--r-- | src/librustc/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/time/duration.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 2d595aa71d0..cc0cf835822 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -32,7 +32,6 @@ #![feature(clone_from_slice)] #![feature(collections)] #![feature(const_fn)] -#![feature(core)] #![feature(duration_span)] #![feature(dynamic_lib)] #![feature(enumset)] diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs index 5270f9e6180..c7f09695164 100644 --- a/src/libstd/time/duration.rs +++ b/src/libstd/time/duration.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[cfg(stage0)] use prelude::v1::*; use ops::{Add, Sub, Mul, Div}; |