diff options
| author | bors <bors@rust-lang.org> | 2017-07-25 16:13:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-25 16:13:16 +0000 |
| commit | c417ee9ae8c30ac307c58591da46cf62e91caac1 (patch) | |
| tree | 8de4b9605fb1ef3b5ddb0ff1ff8277b6981b7f3a /src/liballoc_jemalloc | |
| parent | a643bdc681120446e3f5b787ae009bfa6b5f01b6 (diff) | |
| parent | 9010567dcc0aba772525841aee67c030ea3450c6 (diff) | |
| download | rust-c417ee9ae8c30ac307c58591da46cf62e91caac1.tar.gz rust-c417ee9ae8c30ac307c58591da46cf62e91caac1.zip | |
Auto merge of #43320 - alexcrichton:new-bootstrap, r=Mark-Simulacrum
Bump master to 1.21.0 This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/Cargo.toml | 6 | ||||
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 17 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/liballoc_jemalloc/Cargo.toml b/src/liballoc_jemalloc/Cargo.toml index 99c0bf2aaab..94700cf4475 100644 --- a/src/liballoc_jemalloc/Cargo.toml +++ b/src/liballoc_jemalloc/Cargo.toml @@ -12,12 +12,10 @@ test = false doc = false [dependencies] -core = { path = "../libcore" } -libc = { path = "../rustc/libc_shim" } - -[target.'cfg(not(stage0))'.dependencies] alloc = { path = "../liballoc" } alloc_system = { path = "../liballoc_system" } +core = { path = "../libcore" } +libc = { path = "../rustc/libc_shim" } [build-dependencies] build_helper = { path = "../build_helper" } diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index 72686ddcc09..3a9cc1dd5a6 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -16,26 +16,21 @@ form or name", issue = "27783")] #![deny(warnings)] +#![feature(alloc)] +#![feature(alloc_system)] #![feature(libc)] -#![feature(staged_api)] #![feature(linkage)] -#![cfg_attr(stage0, allocator)] -#![cfg_attr(stage0, feature(allocator))] -#![cfg_attr(not(stage0), feature(global_allocator))] -#![cfg_attr(all(not(stage0), not(dummy_jemalloc)), feature(allocator_api))] -#![cfg_attr(not(stage0), feature(alloc))] -#![cfg_attr(not(stage0), feature(alloc_system))] +#![feature(staged_api)] #![cfg_attr(dummy_jemalloc, allow(dead_code))] +#![cfg_attr(not(dummy_jemalloc), feature(allocator_api))] -#[cfg(not(stage0))] extern crate alloc; -#[cfg(not(stage0))] extern crate alloc_system; extern crate libc; -#[cfg(all(not(stage0), not(dummy_jemalloc)))] +#[cfg(not(dummy_jemalloc))] pub use contents::*; -#[cfg(all(not(stage0), not(dummy_jemalloc)))] +#[cfg(not(dummy_jemalloc))] mod contents { use core::ptr; |