diff options
| author | Ralf Jung <post@ralfj.de> | 2019-11-29 22:57:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-29 22:57:33 +0100 |
| commit | 56203be06f3671ce73d5634bf5c098eb3b8b1c1c (patch) | |
| tree | a8a74fd3b9ca28fc3ef073b4d7f79c709852303c /src/libpanic_unwind | |
| parent | 64efc45bb9f550374df302d219dd721f19604b2b (diff) | |
| parent | babe9fcbc1d5aa5a6a53b7d2e34777cfe28e2c41 (diff) | |
| download | rust-56203be06f3671ce73d5634bf5c098eb3b8b1c1c.tar.gz rust-56203be06f3671ce73d5634bf5c098eb3b8b1c1c.zip | |
Rollup merge of #66766 - RalfJung:panic-comments, r=SimonSapin
Panic machinery comments and tweaks This is mostly more comments, but I also renamed some things: * `BoxMeUp::box_me_up` is not terribly descriptive, and since this is a "take"-style method (the argument is `&mut self` but the return type is fully owned, even though you can't tell from the type) I chose a name involving "take". * `continue_panic_fmt` was very confusing as it was entirely unclear what was being continued -- for some time I thought "continue" might be the same as "resume" for a panic, but that's something entirely different. So I renamed this to `begin_panic_handler`, matching the `begin_panic*` theme of the other entry points. r? @Dylan-DPC @SimonSapin
Diffstat (limited to 'src/libpanic_unwind')
| -rw-r--r-- | src/libpanic_unwind/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index d97a7a8a87d..0c834e5c2a0 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -94,5 +94,5 @@ pub unsafe extern "C" fn __rust_maybe_catch_panic(f: fn(*mut u8), #[unwind(allowed)] pub unsafe extern "C" fn __rust_start_panic(payload: usize) -> u32 { let payload = payload as *mut &mut dyn BoxMeUp; - imp::panic(Box::from_raw((*payload).box_me_up())) + imp::panic(Box::from_raw((*payload).take_box())) } |
