diff options
| author | bors <bors@rust-lang.org> | 2023-03-27 10:44:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-27 10:44:27 +0000 |
| commit | 553ecbe8bae12bc43a34ac0b8a63e17026ce1e8a (patch) | |
| tree | a6f0f5595f20fea86645f5d4cb75a91722ff5578 /library/panic_unwind/src/lib.rs | |
| parent | 7a0600714ab1a4cb2d1a88cd0660b9f9a2c07309 (diff) | |
| parent | 6535e66fa545acaa3c0fe015b83a2e502c10119a (diff) | |
| download | rust-553ecbe8bae12bc43a34ac0b8a63e17026ce1e8a.tar.gz rust-553ecbe8bae12bc43a34ac0b8a63e17026ce1e8a.zip | |
Auto merge of #109652 - matthiaskrgr:rollup-pbw3hi3, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #97506 (Stabilize `nonnull_slice_from_raw_parts`) - #98651 (Follow C-RW-VALUE in std::io::Cursor example) - #102742 (Remove unnecessary raw pointer in __rust_start_panic arg) - #109587 (Use an IndexVec to debug fingerprints.) - #109613 (fix type suggestions in match arms) - #109633 (Fix "Directly go to item in search if there is only one result" setting) - #109635 (debuginfo: Get pointer size/align from tcx.data_layout instead of layout_of) - #109641 (Don't elaborate non-obligations into obligations) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/panic_unwind/src/lib.rs')
| -rw-r--r-- | library/panic_unwind/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/panic_unwind/src/lib.rs b/library/panic_unwind/src/lib.rs index ea3c9a7a663..ce78ab82ef9 100644 --- a/library/panic_unwind/src/lib.rs +++ b/library/panic_unwind/src/lib.rs @@ -99,8 +99,8 @@ pub unsafe extern "C" fn __rust_panic_cleanup(payload: *mut u8) -> *mut (dyn Any // Entry point for raising an exception, just delegates to the platform-specific // implementation. #[rustc_std_internal_symbol] -pub unsafe fn __rust_start_panic(payload: *mut &mut dyn BoxMeUp) -> u32 { - let payload = Box::from_raw((*payload).take_box()); +pub unsafe fn __rust_start_panic(payload: &mut dyn BoxMeUp) -> u32 { + let payload = Box::from_raw(payload.take_box()); imp::panic(payload) } |