@@ -696,14 +696,14 @@ pub fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
696
696
let msg = info. message ( ) ;
697
697
crate :: sys:: backtrace:: __rust_end_short_backtrace ( move || {
698
698
if let Some ( s) = msg. as_str ( ) {
699
- rust_panic_with_hook (
699
+ panic_with_hook (
700
700
& mut StaticStrPayload ( s) ,
701
701
loc,
702
702
info. can_unwind ( ) ,
703
703
info. force_no_backtrace ( ) ,
704
704
) ;
705
705
} else {
706
- rust_panic_with_hook (
706
+ panic_with_hook (
707
707
& mut FormatStringPayload { inner : & msg, string : None } ,
708
708
loc,
709
709
info. can_unwind ( ) ,
@@ -767,7 +767,7 @@ pub const fn begin_panic<M: Any + Send>(msg: M) -> ! {
767
767
768
768
let loc = Location :: caller ( ) ;
769
769
crate :: sys:: backtrace:: __rust_end_short_backtrace ( move || {
770
- rust_panic_with_hook (
770
+ panic_with_hook (
771
771
& mut Payload { inner : Some ( msg) } ,
772
772
loc,
773
773
/* can_unwind */ true ,
@@ -792,7 +792,7 @@ fn payload_as_str(payload: &dyn Any) -> &str {
792
792
/// panics, panic hooks, and finally dispatching to the panic runtime to either
793
793
/// abort or unwind.
794
794
#[ optimize( size) ]
795
- fn rust_panic_with_hook (
795
+ fn panic_with_hook (
796
796
payload : & mut dyn PanicPayload ,
797
797
___location : & Location < ' _ > ,
798
798
can_unwind : bool ,
@@ -855,7 +855,7 @@ fn rust_panic_with_hook(
855
855
crate :: sys:: abort_internal ( ) ;
856
856
}
857
857
858
- rust_panic ( payload)
858
+ panic ( payload)
859
859
}
860
860
861
861
/// This is the entry point for `resume_unwind`.
@@ -882,22 +882,22 @@ pub fn rust_panic_without_hook(payload: Box<dyn Any + Send>) -> ! {
882
882
}
883
883
}
884
884
885
- rust_panic ( & mut RewrapBox ( payload) )
885
+ panic ( & mut RewrapBox ( payload) )
886
886
}
887
887
888
888
/// An unmangled function (through `rustc_std_internal_symbol`) on which to slap
889
889
/// yer breakpoints.
890
890
#[ inline( never) ]
891
891
#[ cfg_attr( not( test) , rustc_std_internal_symbol) ]
892
892
#[ cfg( not( feature = "panic_immediate_abort" ) ) ]
893
- fn rust_panic ( msg : & mut dyn PanicPayload ) -> ! {
893
+ fn panic ( msg : & mut dyn PanicPayload ) -> ! {
894
894
let code = unsafe { __rust_start_panic ( msg) } ;
895
895
rtabort ! ( "failed to initiate panic, error {code}" )
896
896
}
897
897
898
898
#[ cfg_attr( not( test) , rustc_std_internal_symbol) ]
899
899
#[ cfg( feature = "panic_immediate_abort" ) ]
900
- fn rust_panic ( _: & mut dyn PanicPayload ) -> ! {
900
+ fn panic ( _: & mut dyn PanicPayload ) -> ! {
901
901
unsafe {
902
902
crate :: intrinsics:: abort ( ) ;
903
903
}
0 commit comments