Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/liballoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ test = false

[dependencies]
core = { path = "../libcore" }
libc = { path = "../rustc/libc_shim" }
alloc_system = { path = "../liballoc_system" }
7 changes: 0 additions & 7 deletions src/liballoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
7 changes: 7 additions & 0 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@
#![feature(vec_push_all)]
#![feature(zero_one)]

// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc
// might be unavailable or disabled
#![cfg_attr(stage0, feature(alloc_system))]

// Don't link to std. We are std.
#![no_std]

Expand All @@ -295,6 +299,9 @@ extern crate alloc;
extern crate rustc_unicode;
extern crate libc;

#[cfg(stage0)]
extern crate alloc_system;

// Make std testable by not duplicating lang items and other globals. See #2912
#[cfg(test)] extern crate std as realstd;

Expand Down