From 31dcdc9e13c324d33a18db3aed7f4b3208ff3744 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Fri, 31 Jan 2020 12:30:17 -0500
Subject: Drop cfg(bootstrap) code

---
 src/libstd/lib.rs       |  1 -
 src/libstd/macros.rs    | 21 ---------------------
 src/libstd/panicking.rs |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index bc07c6b487b..bf2bf3a30ae 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 fee7ace92ea..4f13e437f9f 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -391,7 +391,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() }
     }
-- 
cgit 1.4.1-3-g733a5