diff options
| author | bors <bors@rust-lang.org> | 2019-07-05 03:33:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-05 03:33:03 +0000 |
| commit | baab1914ec9a9742776a8147780947b48fddf54d (patch) | |
| tree | f3b289eca1a26917641165eaa2c06340441648da /src/liballoc | |
| parent | 4ca7a349da6869286d94fd8159eb225629ffba5f (diff) | |
| parent | 007d87f1719e2fcf2ff36aef8b6dc866fa276386 (diff) | |
| download | rust-baab1914ec9a9742776a8147780947b48fddf54d.tar.gz rust-baab1914ec9a9742776a8147780947b48fddf54d.zip | |
Auto merge of #62376 - Mark-Simulacrum:1.38-nightly, r=alexcrichton
Switch master to 1.38
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/alloc.rs | 3 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
2 files changed, 1 insertions, 3 deletions
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)] |