Skip to content

Commit 4ed226c

Browse files
authored
Rollup merge of rust-lang#144853 - Kivooeo:rust_-cleanup, r=Mark-Simulacrum
Remove unnecessary `rust_` prefixes part of rust-lang#116005 Honestly, not sure if this can affect linking somehow, also I didn't touched things like `__rust_panic_cleanup` and `__rust_start_panic` which very likely will break something, so just small cleanup here also didn't changed `rust_panic_without_hook` because it was renamed here rust-lang#144852 r? libs
2 parents a3c6369 + 61c3e07 commit 4ed226c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

std/src/panicking.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -696,14 +696,14 @@ pub fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
696696
let msg = info.message();
697697
crate::sys::backtrace::__rust_end_short_backtrace(move || {
698698
if let Some(s) = msg.as_str() {
699-
rust_panic_with_hook(
699+
panic_with_hook(
700700
&mut StaticStrPayload(s),
701701
loc,
702702
info.can_unwind(),
703703
info.force_no_backtrace(),
704704
);
705705
} else {
706-
rust_panic_with_hook(
706+
panic_with_hook(
707707
&mut FormatStringPayload { inner: &msg, string: None },
708708
loc,
709709
info.can_unwind(),
@@ -767,7 +767,7 @@ pub const fn begin_panic<M: Any + Send>(msg: M) -> ! {
767767

768768
let loc = Location::caller();
769769
crate::sys::backtrace::__rust_end_short_backtrace(move || {
770-
rust_panic_with_hook(
770+
panic_with_hook(
771771
&mut Payload { inner: Some(msg) },
772772
loc,
773773
/* can_unwind */ true,
@@ -792,7 +792,7 @@ fn payload_as_str(payload: &dyn Any) -> &str {
792792
/// panics, panic hooks, and finally dispatching to the panic runtime to either
793793
/// abort or unwind.
794794
#[optimize(size)]
795-
fn rust_panic_with_hook(
795+
fn panic_with_hook(
796796
payload: &mut dyn PanicPayload,
797797
location: &Location<'_>,
798798
can_unwind: bool,
@@ -885,8 +885,8 @@ pub fn rust_panic_without_hook(payload: Box<dyn Any + Send>) -> ! {
885885
rust_panic(&mut RewrapBox(payload))
886886
}
887887

888-
/// An unmangled function (through `rustc_std_internal_symbol`) on which to slap
889-
/// yer breakpoints.
888+
/// A function with a fixed suffix (through `rustc_std_internal_symbol`)
889+
/// on which to slap yer breakpoints.
890890
#[inline(never)]
891891
#[cfg_attr(not(test), rustc_std_internal_symbol)]
892892
#[cfg(not(feature = "panic_immediate_abort"))]

0 commit comments

Comments
 (0)