diff options
| author | bors <bors@rust-lang.org> | 2023-04-22 12:27:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-22 12:27:45 +0000 |
| commit | c7155f2a785294e6f1bbb92fb5dbc797620a5df9 (patch) | |
| tree | 70ce10f7b76ee7dca49ab72e7b536aa3188a887c /example/alloc_example.rs | |
| parent | 6b80e9c0a6fec3080c82809c277b54cfa2334778 (diff) | |
| parent | 2ead2f56c0d5340bfa24261c0bd84e3d69f81138 (diff) | |
| download | rust-c7155f2a785294e6f1bbb92fb5dbc797620a5df9.tar.gz rust-c7155f2a785294e6f1bbb92fb5dbc797620a5df9.zip | |
Auto merge of #109507 - Amanieu:panic-oom-payload, r=davidtwco
Report allocation errors as panics OOM is now reported as a panic but with a custom payload type (`AllocErrorPanicPayload`) which holds the layout that was passed to `handle_alloc_error`. This should be review one commit at a time: - The first commit adds `AllocErrorPanicPayload` and changes allocation errors to always be reported as panics. - The second commit removes `#[alloc_error_handler]` and the `alloc_error_hook` API. ACP: https://github.com/rust-lang/libs-team/issues/192 Closes #51540 Closes #51245
Diffstat (limited to 'example/alloc_example.rs')
| -rw-r--r-- | example/alloc_example.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/example/alloc_example.rs b/example/alloc_example.rs index 4ede2fe4efe..e39c3272958 100644 --- a/example/alloc_example.rs +++ b/example/alloc_example.rs @@ -1,4 +1,4 @@ -#![feature(start, core_intrinsics, alloc_error_handler)] +#![feature(start, core_intrinsics)] #![no_std] extern crate alloc; @@ -22,11 +22,6 @@ fn panic_handler(_: &core::panic::PanicInfo) -> ! { core::intrinsics::abort(); } -#[alloc_error_handler] -fn alloc_error_handler(_: alloc::alloc::Layout) -> ! { - core::intrinsics::abort(); -} - #[start] fn main(_argc: isize, _argv: *const *const u8) -> isize { let world: Box<&str> = Box::new("Hello World!\0"); |
