Skip to content

Commit 38cf202

Browse files
committed
remove rust_ prefixes
1 parent da19b9d commit 38cf202

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

library/std/src/panicking.rs

Lines changed: 8 additions & 8 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,
@@ -855,7 +855,7 @@ fn rust_panic_with_hook(
855855
crate::sys::abort_internal();
856856
}
857857

858-
rust_panic(payload)
858+
panic(payload)
859859
}
860860

861861
/// This is the entry point for `resume_unwind`.
@@ -882,22 +882,22 @@ pub fn rust_panic_without_hook(payload: Box<dyn Any + Send>) -> ! {
882882
}
883883
}
884884

885-
rust_panic(&mut RewrapBox(payload))
885+
panic(&mut RewrapBox(payload))
886886
}
887887

888888
/// An unmangled function (through `rustc_std_internal_symbol`) on which to slap
889889
/// yer breakpoints.
890890
#[inline(never)]
891891
#[cfg_attr(not(test), rustc_std_internal_symbol)]
892892
#[cfg(not(feature = "panic_immediate_abort"))]
893-
fn rust_panic(msg: &mut dyn PanicPayload) -> ! {
893+
fn panic(msg: &mut dyn PanicPayload) -> ! {
894894
let code = unsafe { __rust_start_panic(msg) };
895895
rtabort!("failed to initiate panic, error {code}")
896896
}
897897

898898
#[cfg_attr(not(test), rustc_std_internal_symbol)]
899899
#[cfg(feature = "panic_immediate_abort")]
900-
fn rust_panic(_: &mut dyn PanicPayload) -> ! {
900+
fn panic(_: &mut dyn PanicPayload) -> ! {
901901
unsafe {
902902
crate::intrinsics::abort();
903903
}

0 commit comments

Comments
 (0)