diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2016-02-20 17:57:14 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2016-02-21 15:32:43 +0100 |
| commit | 8ade08041294446fd44978a9a068cb3b30ca4001 (patch) | |
| tree | beb295111a3c44689e48b931f38c4bc8209532bf /src/liballoc | |
| parent | 2d14b39204e648a219a17335e712c3fb14666a07 (diff) | |
| download | rust-8ade08041294446fd44978a9a068cb3b30ca4001.tar.gz rust-8ade08041294446fd44978a9a068cb3b30ca4001.zip | |
Fix liballoc dependencies
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml index 5af8d9e8e27..5da0f1a10b9 100644 --- a/src/liballoc/Cargo.toml +++ b/src/liballoc/Cargo.toml @@ -10,5 +10,3 @@ test = false [dependencies] core = { path = "../libcore" } -libc = { path = "../rustc/libc_shim" } -alloc_system = { path = "../liballoc_system" } diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 1438103d7f6..1d928a922c7 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -92,16 +92,9 @@ #![feature(unsafe_no_drop_flag, filling_drop)] #![feature(unsize)] -// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc -// might be unavailable or disabled -#![cfg_attr(stage0, feature(alloc_system))] - #![cfg_attr(not(test), feature(raw, fn_traits, placement_new_protocol))] #![cfg_attr(test, feature(test, rustc_private, box_heap))] -#[cfg(stage0)] -extern crate alloc_system; - // Allow testing this library #[cfg(test)] |