diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-25 16:26:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 16:26:22 +0200 |
| commit | 1e8dd3756171a8a01f3951d61ff6ba8d1ef5bd7d (patch) | |
| tree | 8cfaca24961df42b0c4f69dd214d1b9e552ce7d4 /src/liballoc/alloc.rs | |
| parent | a1b5dfaaf7f99ec2f35143864927ba76b8a3727b (diff) | |
| parent | f359a94849f5a66be4e5058ad9f5a480623a4627 (diff) | |
| download | rust-1e8dd3756171a8a01f3951d61ff6ba8d1ef5bd7d.tar.gz rust-1e8dd3756171a8a01f3951d61ff6ba8d1ef5bd7d.zip | |
Rollup merge of #64764 - Mark-Simulacrum:snap, r=Centril
Master is now 1.40 r? @pietroalbini
Diffstat (limited to 'src/liballoc/alloc.rs')
| -rw-r--r-- | src/liballoc/alloc.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index a39fcd5ad4c..9bc76f51570 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -240,7 +240,6 @@ pub(crate) unsafe fn box_free<T: ?Sized>(ptr: Unique<T>) { #[stable(feature = "global_alloc", since = "1.28.0")] #[rustc_allocator_nounwind] pub fn handle_alloc_error(layout: Layout) -> ! { - #[cfg_attr(bootstrap, allow(improper_ctypes))] extern "Rust" { #[lang = "oom"] fn oom_impl(layout: Layout) -> !; |