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/liblibc | |
| 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/liblibc')
| -rw-r--r-- | src/liblibc/lib.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index dc35b0ae8ec..2718694490c 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -15,7 +15,6 @@ #![cfg_attr(not(feature = "cargo-build"), unstable(feature = "libc", reason = "use `libc` from crates.io"))] #![cfg_attr(not(feature = "cargo-build"), feature(staged_api, no_std))] -#![cfg_attr(all(not(feature = "cargo-build"), stage0), feature(core))] #![cfg_attr(not(feature = "cargo-build"), staged_api)] #![cfg_attr(not(feature = "cargo-build"), no_std)] #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", @@ -79,7 +78,6 @@ #![allow(bad_style, raw_pointer_derive)] #![cfg_attr(target_os = "nacl", allow(unused_imports))] #[cfg(feature = "cargo-build")] extern crate std as core; -#[cfg(all(stage0, not(feature = "cargo-build")))] extern crate core; #[cfg(test)] extern crate std; #[cfg(test)] extern crate test; |