From 9010567dcc0aba772525841aee67c030ea3450c6 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 17 Jul 2017 09:32:08 -0700 Subject: 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. --- src/liballoc_jemalloc/lib.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/liballoc_jemalloc/lib.rs') 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; -- cgit 1.4.1-3-g733a5