From 31dcdc9e13c324d33a18db3aed7f4b3208ff3744 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Fri, 31 Jan 2020 12:30:17 -0500 Subject: [PATCH] Drop cfg(bootstrap) code --- src/bootstrap/lib.rs | 2 +- src/libcore/fmt/mod.rs | 13 +------------ src/libcore/fmt/rt/v1.rs | 9 --------- src/libcore/lib.rs | 1 - src/libcore/tests/lib.rs | 1 - src/libpanic_unwind/seh.rs | 17 +++++------------ src/librustc/benches/lib.rs | 1 - src/librustc/lib.rs | 1 - src/librustc_ast_passes/lib.rs | 2 -- src/librustc_codegen_ssa/lib.rs | 1 - src/librustc_metadata/lib.rs | 1 - src/librustc_mir/lib.rs | 1 - src/librustc_mir_build/lib.rs | 1 - src/librustc_parse/lib.rs | 1 - src/librustc_passes/lib.rs | 1 - src/librustc_resolve/lib.rs | 1 - src/librustc_target/lib.rs | 1 - src/librustc_ty/lib.rs | 1 - src/librustc_typeck/lib.rs | 1 - src/libstd/lib.rs | 1 - src/libstd/macros.rs | 21 --------------------- src/libstd/panicking.rs | 2 +- src/libsyntax/lib.rs | 1 - 23 files changed, 8 insertions(+), 74 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 1fee3fd9ac1..637323331f5 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1026,7 +1026,7 @@ impl Build { } fn llvm_link_tools_dynamically(&self, target: Interned) -> bool { - (target.contains("linux-gnu") || target.contains("apple-darwin")) + target.contains("linux-gnu") || target.contains("apple-darwin") } /// Returns the `version` string associated with this compiler for Rust diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 900ef63f1df..973c2f2b915 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -1080,18 +1080,7 @@ fn run(fmt: &mut Formatter<'_>, arg: &rt::v1::Argument, args: &[ArgumentV1<'_>]) fmt.precision = getcount(args, &arg.format.precision); // Extract the correct argument - let value = { - #[cfg(bootstrap)] - { - match arg.position { - rt::v1::Position::At(i) => args[i], - } - } - #[cfg(not(bootstrap))] - { - args[arg.position] - } - }; + let value = args[arg.position]; // Then actually do some printing (value.formatter)(value.value, fmt) diff --git a/src/libcore/fmt/rt/v1.rs b/src/libcore/fmt/rt/v1.rs index fd81f93242b..f6460470bfe 100644 --- a/src/libcore/fmt/rt/v1.rs +++ b/src/libcore/fmt/rt/v1.rs @@ -7,9 +7,6 @@ #[derive(Copy, Clone)] pub struct Argument { - #[cfg(bootstrap)] - pub position: Position, - #[cfg(not(bootstrap))] pub position: usize, pub format: FormatSpec, } @@ -42,9 +39,3 @@ pub enum Count { Param(usize), Implied, } - -#[cfg(bootstrap)] -#[derive(Copy, Clone)] -pub enum Position { - At(usize), -} diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index ce7ddffd825..ac43fc2d4ff 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -133,7 +133,6 @@ #![feature(associated_type_bounds)] #![feature(const_type_id)] #![feature(const_caller_location)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(assoc_int_consts)] #[prelude_import] diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index 8fd19ef67fc..56ba6525a4b 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -18,7 +18,6 @@ #![feature(range_is_empty)] #![feature(raw)] #![feature(saturating_neg)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(sort_internals)] #![feature(slice_partition_at_index)] #![feature(specialization)] diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs index d9dca2c0f4f..6f507e85e74 100644 --- a/src/libpanic_unwind/seh.rs +++ b/src/libpanic_unwind/seh.rs @@ -282,12 +282,7 @@ pub unsafe fn panic(data: Box) -> u32 { // // In any case, we basically need to do something like this until we can // express more operations in statics (and we may never be able to). - if !cfg!(bootstrap) { - atomic_store( - &mut THROW_INFO.pmfnUnwind as *mut _ as *mut u32, - ptr!(exception_cleanup) as u32, - ); - } + atomic_store(&mut THROW_INFO.pmfnUnwind as *mut _ as *mut u32, ptr!(exception_cleanup) as u32); atomic_store( &mut THROW_INFO.pCatchableTypeArray as *mut _ as *mut u32, ptr!(&CATCHABLE_TYPE_ARRAY as *const _) as u32, @@ -300,12 +295,10 @@ pub unsafe fn panic(data: Box) -> u32 { &mut CATCHABLE_TYPE.pType as *mut _ as *mut u32, ptr!(&TYPE_DESCRIPTOR as *const _) as u32, ); - if !cfg!(bootstrap) { - atomic_store( - &mut CATCHABLE_TYPE.copyFunction as *mut _ as *mut u32, - ptr!(exception_copy) as u32, - ); - } + atomic_store( + &mut CATCHABLE_TYPE.copyFunction as *mut _ as *mut u32, + ptr!(exception_copy) as u32, + ); extern "system" { #[unwind(allowed)] diff --git a/src/librustc/benches/lib.rs b/src/librustc/benches/lib.rs index de82b262e49..237751bcbd7 100644 --- a/src/librustc/benches/lib.rs +++ b/src/librustc/benches/lib.rs @@ -1,4 +1,3 @@ -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(test)] extern crate test; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 69ca4063694..744ee1a65e1 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -42,7 +42,6 @@ #![feature(optin_builtin_traits)] #![feature(option_expect_none)] #![feature(range_is_empty)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(specialization)] #![feature(unboxed_closures)] #![feature(thread_local)] diff --git a/src/librustc_ast_passes/lib.rs b/src/librustc_ast_passes/lib.rs index 5de45f4e1f3..c5bafa54b3c 100644 --- a/src/librustc_ast_passes/lib.rs +++ b/src/librustc_ast_passes/lib.rs @@ -2,8 +2,6 @@ //! parsed by `rustc_parse` and then lowered, after the passes in this crate, //! by `rustc_ast_lowering`. -#![cfg_attr(bootstrap, feature(slice_patterns))] - pub mod ast_validation; pub mod feature_gate; pub mod show_span; diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs index b69def5428c..f39587122c5 100644 --- a/src/librustc_codegen_ssa/lib.rs +++ b/src/librustc_codegen_ssa/lib.rs @@ -4,7 +4,6 @@ #![feature(box_syntax)] #![feature(core_intrinsics)] #![feature(libc)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(stmt_expr_attributes)] #![feature(try_blocks)] #![feature(in_band_lifetimes)] diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index cf925ab9187..d94f23ff8bc 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -10,7 +10,6 @@ #![feature(proc_macro_internals)] #![feature(proc_macro_quote)] #![feature(rustc_private)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(specialization)] #![feature(stmt_expr_attributes)] #![recursion_limit = "256"] diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs index 5e42ba32790..f064869d664 100644 --- a/src/librustc_mir/lib.rs +++ b/src/librustc_mir/lib.rs @@ -7,7 +7,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment! #![feature(nll)] #![feature(in_band_lifetimes)] #![feature(inner_deref)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(bool_to_option)] #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/librustc_mir_build/lib.rs b/src/librustc_mir_build/lib.rs index 42292d635bc..3c35827d15d 100644 --- a/src/librustc_mir_build/lib.rs +++ b/src/librustc_mir_build/lib.rs @@ -5,7 +5,6 @@ #![feature(box_patterns)] #![feature(box_syntax)] #![feature(crate_visibility_modifier)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(bool_to_option)] #![recursion_limit = "256"] diff --git a/src/librustc_parse/lib.rs b/src/librustc_parse/lib.rs index 08f4f210152..76aa51e85a6 100644 --- a/src/librustc_parse/lib.rs +++ b/src/librustc_parse/lib.rs @@ -2,7 +2,6 @@ #![feature(bool_to_option)] #![feature(crate_visibility_modifier)] -#![cfg_attr(bootstrap, feature(slice_patterns))] use syntax::ast; use syntax::print::pprust; diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs index 4c0fd903db0..c5e5bc96915 100644 --- a/src/librustc_passes/lib.rs +++ b/src/librustc_passes/lib.rs @@ -7,7 +7,6 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(in_band_lifetimes)] #![feature(nll)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![recursion_limit = "256"] #[macro_use] diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 0b1752419b8..91a46295d54 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -11,7 +11,6 @@ #![feature(crate_visibility_modifier)] #![feature(label_break_value)] #![feature(nll)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![recursion_limit = "256"] pub use rustc_hir::def::{Namespace, PerNS}; diff --git a/src/librustc_target/lib.rs b/src/librustc_target/lib.rs index 84c6d720b8e..a9db0254a7d 100644 --- a/src/librustc_target/lib.rs +++ b/src/librustc_target/lib.rs @@ -11,7 +11,6 @@ #![feature(box_syntax)] #![feature(bool_to_option)] #![feature(nll)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #[macro_use] extern crate log; diff --git a/src/librustc_ty/lib.rs b/src/librustc_ty/lib.rs index e5ec98743e0..37faa2281b3 100644 --- a/src/librustc_ty/lib.rs +++ b/src/librustc_ty/lib.rs @@ -8,7 +8,6 @@ #![feature(bool_to_option)] #![feature(in_band_lifetimes)] #![feature(nll)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![recursion_limit = "256"] #[macro_use] diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 3d27f9191dd..05ea9b1ac56 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -64,7 +64,6 @@ This API is completely unstable and subject to change. #![feature(exhaustive_patterns)] #![feature(in_band_lifetimes)] #![feature(nll)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(try_blocks)] #![feature(never_type)] #![recursion_limit = "256"] 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(msg: M, #[cfg(bootstrap)] _: &(&str, u32, u32)) -> ! { +pub fn begin_panic(msg: M) -> ! { if cfg!(feature = "panic_immediate_abort") { unsafe { intrinsics::abort() } } diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index b0c2aa3dbb2..f359d0dd7bf 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -13,7 +13,6 @@ #![feature(label_break_value)] #![feature(nll)] #![feature(try_trait)] -#![cfg_attr(bootstrap, feature(slice_patterns))] #![feature(unicode_internals)] #![recursion_limit = "256"]