diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-09 00:20:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-09 00:20:35 +0200 |
| commit | 21b5c1d51e9fcf26eca5a1ccc8dfaee5240f7522 (patch) | |
| tree | b6a64d9a639c695e131be663ff9ca613e1da8fdf /src/liballoc/alloc.rs | |
| parent | 2410b4de7c425b1160a4368bc944d081d6e48a70 (diff) | |
| parent | ee189ae028ce4ff620630686432f44b0ea706181 (diff) | |
| download | rust-21b5c1d51e9fcf26eca5a1ccc8dfaee5240f7522.tar.gz rust-21b5c1d51e9fcf26eca5a1ccc8dfaee5240f7522.zip | |
Rollup merge of #61660 - petrochenkov:nocusta, r=Centril
Minimize use of `#![feature(custom_attribute)]` Some preparations before resurrecting https://github.com/rust-lang/rust/pull/57921.
Diffstat (limited to 'src/liballoc/alloc.rs')
| -rw-r--r-- | src/liballoc/alloc.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 41ff06d70ff..755feb84962 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -15,7 +15,8 @@ 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. - #[allocator] + #[cfg_attr(bootstrap, allocator)] + #[cfg_attr(not(bootstrap), rustc_allocator)] #[rustc_allocator_nounwind] fn __rust_alloc(size: usize, align: usize) -> *mut u8; #[rustc_allocator_nounwind] |