diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2019-09-23 09:35:50 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-09-23 09:35:50 -0700 |
| commit | 1a8897fd8a988cc3c81b7cb985005d6cf836116c (patch) | |
| tree | 919b4028590aae9fa4246fb247a88902d181314d /src/libcore | |
| parent | b92330691378199f14facf4776c197826b9d0fab (diff) | |
| download | rust-1a8897fd8a988cc3c81b7cb985005d6cf836116c.tar.gz rust-1a8897fd8a988cc3c81b7cb985005d6cf836116c.zip | |
Fix rebase conflicts
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/panicking.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 3d2bc24bf24..7b7253419b1 100644 --- 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<'_>) -> !; |