From 8a7dded1a249a21540583333204c378bf960a700 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 4 Jul 2019 10:05:50 -0400 Subject: Switch master to 1.38 --- src/liballoc/alloc.rs | 3 +-- src/liballoc/lib.rs | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/liballoc') diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 755feb84962..cef2b5eea34 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -15,8 +15,7 @@ extern "Rust" { // them from the `#[global_allocator]` attribute if there is one, or uses the // default implementations in libstd (`__rdl_alloc` etc in `src/libstd/alloc.rs`) // otherwise. - #[cfg_attr(bootstrap, allocator)] - #[cfg_attr(not(bootstrap), rustc_allocator)] + #[rustc_allocator] #[rustc_allocator_nounwind] fn __rust_alloc(size: usize, align: usize) -> *mut u8; #[rustc_allocator_nounwind] diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index bfe7d12d9d0..0750665c6b4 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -79,7 +79,6 @@ #![feature(coerce_unsized)] #![feature(dispatch_from_dyn)] #![feature(core_intrinsics)] -#![cfg_attr(bootstrap, feature(custom_attribute))] #![feature(dropck_eyepatch)] #![feature(exact_size_is_empty)] #![feature(fmt_internals)] -- cgit 1.4.1-3-g733a5