diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-25 00:08:33 +0200 | 
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-25 00:08:33 +0200 | 
| commit | 33253fa6a42565eeae40e63401a41ac2dcc9e92f (patch) | |
| tree | f0d3a82149da5df750f76000a5acdf0e0c3f665f /library/alloc/src | |
| parent | 653cfdb436256cbc8415630b2537707ae1663806 (diff) | |
| download | rust-33253fa6a42565eeae40e63401a41ac2dcc9e92f.tar.gz rust-33253fa6a42565eeae40e63401a41ac2dcc9e92f.zip | |
Revert "Rename -Zoom=panic to -Zoom=unwind"
This reverts commit 4b981c26487ebe56de6b3000fcd98713804beefc.
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/alloc.rs | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs index 0db23e55a86..97bedc604da 100644 --- a/library/alloc/src/alloc.rs +++ b/library/alloc/src/alloc.rs @@ -398,7 +398,7 @@ fn rust_oom(layout: Layout) -> ! { fn panic_impl(pi: &core::panic::PanicInfo<'_>) -> !; // This symbol is emitted by rustc . - // Its value depends on the -Zoom={unwind,abort} compiler option. + // Its value depends on the -Zoom={panic,abort} compiler option. static __rust_alloc_error_handler_should_panic: u8; } @@ -458,7 +458,7 @@ pub mod __alloc_error_handler { pub unsafe fn __rdl_oom(size: usize, _align: usize) -> ! { extern "Rust" { // This symbol is emitted by rustc next to __rust_alloc_error_handler. - // Its value depends on the -Zoom={unwind,abort} compiler option. + // Its value depends on the -Zoom={panic,abort} compiler option. static __rust_alloc_error_handler_should_panic: u8; } | 
