Fix rebase conflicts

alexcrichton · alexcrichton · commit 1a8897fd8a98 · 2019-09-23T09:35:50.000-07:00
diff --git a/src/libcore/panicking.rs b/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<'_>) -> !;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ pub fn panic_fmt(fmt: fmt::Arguments<'_>, file_line_col: &(&'static str, u32, u3`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// NOTE This function never crosses the FFI boundary; it's a Rust-to-Rust call`
`74`		`- #[cfg_attr(boostrap_stdarch_ignore_this, allow(improper_ctypes))]`
	`74`	`+ #[cfg_attr(bootstrap, allow(improper_ctypes))]`
`75`	`75`	`extern "Rust" {`
`76`	`76`	`#[lang = "panic_impl"]`
`77`	`77`	`fn panic_impl(pi: &PanicInfo<'_>) -> !;`