From 8ade08041294446fd44978a9a068cb3b30ca4001 Mon Sep 17 00:00:00 2001 From: John Kåre Alsaker Date: Sat, 20 Feb 2016 17:57:14 +0100 Subject: Fix liballoc dependencies --- src/liballoc/Cargo.toml | 2 -- src/liballoc/lib.rs | 7 ------- 2 files changed, 9 deletions(-) (limited to 'src/liballoc') 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)] -- cgit 1.4.1-3-g733a5