diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 22:11:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 22:42:22 -0700 |
| commit | 837ae4f3d417151c3d2b38672bf92174d8d9266b (patch) | |
| tree | 042a42462a85d298668f0974ab97e2a652414434 /src/liballoc | |
| parent | bbef8893f798452874f15374992804c8184c32c5 (diff) | |
| parent | 938099a7ebccbad2a2cad58d71df316d5ccd512c (diff) | |
| download | rust-837ae4f3d417151c3d2b38672bf92174d8d9266b.tar.gz rust-837ae4f3d417151c3d2b38672bf92174d8d9266b.zip | |
rollup merge of #27678: alexcrichton/snapshots
* Lots of core prelude imports removed * Makefile support for MSVC env vars and Rust crates removed * Makefile support for morestack removed
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 3 | ||||
| -rw-r--r-- | src/liballoc/boxed.rs | 3 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 3 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 56c7324090e..ccf8784e2a7 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -71,9 +71,6 @@ use boxed::Box; -#[cfg(stage0)] -use core::prelude::v1::*; - use core::atomic; use core::atomic::Ordering::{Relaxed, Release, Acquire, SeqCst}; use core::fmt; diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index ab1a5ba9019..f31bb60ed97 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -53,9 +53,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -#[cfg(stage0)] -use core::prelude::v1::*; - use heap; use raw_vec::RawVec; diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index ea58ea0ba6f..6551011e81d 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -92,7 +92,6 @@ #![feature(unsize)] #![feature(core_slice_ext)] #![feature(core_str_ext)] -#![cfg_attr(stage0, feature(core, core_prelude))] #![cfg_attr(test, feature(test, alloc, rustc_private, box_raw))] #![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")), @@ -101,8 +100,6 @@ #[cfg(all(not(feature = "external_funcs"), not(feature = "external_crate")))] extern crate libc; -#[cfg(stage0)] #[macro_use] extern crate core; - // Allow testing this library #[cfg(test)] #[macro_use] extern crate std; diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 05fd36e8e7f..620ceaa346b 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -150,9 +150,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -#[cfg(stage0)] -use core::prelude::v1::*; - #[cfg(not(test))] use boxed::Box; #[cfg(test)] |