diff options
| author | bors <bors@rust-lang.org> | 2020-02-04 14:16:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-04 14:16:18 +0000 |
| commit | 126ad2b813010447807b0593a80bc6c04962e7ea (patch) | |
| tree | da18ca4b2fec7be348e271c47cb9543f803331df /src/libstd | |
| parent | bae3d0dfc716ccbe511455275b77ccb3b5b8437b (diff) | |
| parent | dbc9894095d7ebc35e521075c98ea0d55175fdd3 (diff) | |
| download | rust-126ad2b813010447807b0593a80bc6c04962e7ea.tar.gz rust-126ad2b813010447807b0593a80bc6c04962e7ea.zip | |
Auto merge of #68708 - Mark-Simulacrum:stage0-step, r=pietroalbini
Step stage0 to bootstrap from 1.42 This also includes a commit which fixes the rustfmt downloading logic to redownload when the rustfmt channel changes, and bumps rustfmt to a more recent version.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 21 | ||||
| -rw-r--r-- | src/libstd/panicking.rs | 2 |
3 files changed, 1 insertions, 23 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 230fa84cc15..806f868ff24 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -294,7 +294,6 @@ #![feature(shrink_to)] #![feature(slice_concat_ext)] #![feature(slice_internals)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(specialization)] #![feature(staged_api)] #![feature(std_internals)] diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 18fb0f87688..9e1ac8754d9 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -4,27 +4,6 @@ //! library. Each macro is available for use when linking against the standard //! library. -#[cfg(bootstrap)] -#[doc(include = "../libcore/macros/panic.md")] -#[macro_export] -#[stable(feature = "rust1", since = "1.0.0")] -#[allow_internal_unstable(libstd_sys_internals)] -macro_rules! panic { - () => ({ - $crate::panic!("explicit panic") - }); - ($msg:expr) => ({ - $crate::rt::begin_panic($msg, &($crate::file!(), $crate::line!(), $crate::column!())) - }); - ($msg:expr,) => ({ - $crate::panic!($msg) - }); - ($fmt:expr, $($arg:tt)+) => ({ - $crate::rt::begin_panic_fmt(&$crate::format_args!($fmt, $($arg)+)) - }); -} - -#[cfg(not(bootstrap))] #[doc(include = "../libcore/macros/panic.md")] #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 54a57b4444c..8b12aaaa7e2 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -389,7 +389,7 @@ pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! { #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))] #[cold] #[track_caller] -pub fn begin_panic<M: Any + Send>(msg: M, #[cfg(bootstrap)] _: &(&str, u32, u32)) -> ! { +pub fn begin_panic<M: Any + Send>(msg: M) -> ! { if cfg!(feature = "panic_immediate_abort") { unsafe { intrinsics::abort() } } |