diff options
| author | bors <bors@rust-lang.org> | 2019-09-25 14:27:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-25 14:27:08 +0000 |
| commit | 6c2c29c43206d6e2f1091fa278d2792ea10e3659 (patch) | |
| tree | 8cfaca24961df42b0c4f69dd214d1b9e552ce7d4 /src/liballoc/alloc.rs | |
| parent | acf7b50c737cfb8f4003477559305bedf3c316fe (diff) | |
| parent | 1e8dd3756171a8a01f3951d61ff6ba8d1ef5bd7d (diff) | |
| download | rust-6c2c29c43206d6e2f1091fa278d2792ea10e3659.tar.gz rust-6c2c29c43206d6e2f1091fa278d2792ea10e3659.zip | |
Auto merge of #64766 - Centril:rollup-gdy5jr6, r=Centril
Rollup of 6 pull requests Successful merges: - #62975 (Almost fully deprecate hir::map::Map.hir_to_node_id) - #64386 (use `sign` variable in abs and wrapping_abs methods) - #64508 (or-patterns: Push `PatKind/PatternKind::Or` at top level to HIR & HAIR) - #64738 (Add const-eval support for SIMD types, insert, and extract) - #64759 (Refactor mbe a tiny bit) - #64764 (Master is now 1.40 ) Failed merges: r? @ghost
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) -> !; |