Skip to content
Permalink
Browse files

Fix rebase conflicts

  • Loading branch information...
alexcrichton committed Sep 23, 2019
1 parent b923306 commit 1a8897fd8a988cc3c81b7cb985005d6cf836116c
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/libcore/panicking.rs
@@ -71,7 +71,7 @@ pub fn panic_fmt(fmt: fmt::Arguments<'_>, file_line_col: &(&'static str, u32, u3
}

// NOTE This function never crosses the FFI boundary; it's a Rust-to-Rust call
#[cfg_attr(boostrap_stdarch_ignore_this, allow(improper_ctypes))]
#[cfg_attr(bootstrap, allow(improper_ctypes))]
extern "Rust" {
#[lang = "panic_impl"]
fn panic_impl(pi: &PanicInfo<'_>) -> !;

0 comments on commit 1a8897f

Please sign in to comment.
You can’t perform that action at this time.