Skip to content

Commit 03df365

Browse files
committed
fix errors introduced in rebase
1 parent 78cff68 commit 03df365

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

library/core/src/panicking.rs

-9
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,7 @@ pub fn panic_nounwind_fmt(fmt: fmt::Arguments<'_>) -> ! {
101101
super::intrinsics::abort()
102102
}
103103

104-
// NOTE This function never crosses the FFI boundary; it's a Rust-to-Rust call
105-
// that gets resolved to the `#[panic_handler]` function.
106-
extern "Rust" {
107-
#[lang = "panic_impl"]
108-
fn panic_impl(pi: &PanicInfo<'_>) -> !;
109-
}
110-
111104
// PanicInfo with the `can_unwind` flag set to false forces an abort.
112-
let pieces = [msg];
113-
let fmt = fmt::Arguments::new_v1(&pieces, &[]);
114105
let pi = PanicInfo::internal_constructor(Some(&fmt), Location::caller(), None, false);
115106

116107
// SAFETY: `panic_impl` is defined in safe Rust code and thus is safe to call.

0 commit comments

Comments
 (0)