diff options
56 files changed, 64 insertions, 147 deletions
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index 0156c5016ac..89c027585df 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -35,7 +35,7 @@ #![feature(let_else)] #![feature(never_type)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] use rustc_ast::token::{self, Token}; use rustc_ast::tokenstream::{CanSynthesizeMissingTokens, TokenStream, TokenTree}; diff --git a/compiler/rustc_ast_passes/src/lib.rs b/compiler/rustc_ast_passes/src/lib.rs index f4863137bdd..876dd7f757c 100644 --- a/compiler/rustc_ast_passes/src/lib.rs +++ b/compiler/rustc_ast_passes/src/lib.rs @@ -8,7 +8,7 @@ #![feature(box_patterns)] #![feature(let_else)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] pub mod ast_validation; pub mod feature_gate; diff --git a/compiler/rustc_borrowck/src/lib.rs b/compiler/rustc_borrowck/src/lib.rs index 590c5799ff6..c489f409fb5 100644 --- a/compiler/rustc_borrowck/src/lib.rs +++ b/compiler/rustc_borrowck/src/lib.rs @@ -9,7 +9,7 @@ #![feature(trusted_step)] #![feature(try_blocks)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_middle; diff --git a/compiler/rustc_builtin_macros/src/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs index 38877399943..a05122394a0 100644 --- a/compiler/rustc_builtin_macros/src/lib.rs +++ b/compiler/rustc_builtin_macros/src/lib.rs @@ -13,7 +13,7 @@ #![feature(proc_macro_internals)] #![feature(proc_macro_quote)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] extern crate proc_macro; diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index 75836e14385..fa48abdfbc8 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -11,7 +11,7 @@ #![feature(extern_types)] #![feature(nll)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] use back::write::{create_informational_target_machine, create_target_machine}; diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs index 9bb8db076a8..25e27f565ea 100644 --- a/compiler/rustc_codegen_ssa/src/lib.rs +++ b/compiler/rustc_codegen_ssa/src/lib.rs @@ -7,7 +7,7 @@ #![feature(nll)] #![feature(associated_type_bounds)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] //! This crate contains codegen code that is used by all codegen backends (LLVM and others). //! The backend-agnostic functions of this crate use functions defined in various traits that diff --git a/compiler/rustc_const_eval/src/lib.rs b/compiler/rustc_const_eval/src/lib.rs index 77d312f5851..d688331ae0a 100644 --- a/compiler/rustc_const_eval/src/lib.rs +++ b/compiler/rustc_const_eval/src/lib.rs @@ -22,7 +22,7 @@ Rust MIR: a lowered representation of Rust. #![feature(trusted_step)] #![feature(try_blocks)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_data_structures/src/intern.rs b/compiler/rustc_data_structures/src/intern.rs index c79a5ebf093..46054fe7bcb 100644 --- a/compiler/rustc_data_structures/src/intern.rs +++ b/compiler/rustc_data_structures/src/intern.rs @@ -20,7 +20,7 @@ mod private { /// but you can only construct a `Interned` with `new_unchecked`, and not /// directly. #[derive(Debug)] -#[cfg_attr(not(bootstrap), rustc_pass_by_value)] +#[rustc_pass_by_value] pub struct Interned<'a, T>(pub &'a T, pub private::PrivateZst); impl<'a, T> Interned<'a, T> { diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs index 3e93fe9a11f..b1e59d65029 100644 --- a/compiler/rustc_data_structures/src/lib.rs +++ b/compiler/rustc_data_structures/src/lib.rs @@ -28,7 +28,7 @@ #![feature(vec_into_raw_parts)] #![allow(rustc::default_hash_types)] #![deny(unaligned_references)] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index 563ec8b0e3a..db03ee8c4bc 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -9,7 +9,7 @@ #![feature(let_else)] #![feature(once_cell)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index 463308c27b2..fdfedffc529 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -8,9 +8,9 @@ #![feature(if_let_guard)] #![feature(let_else)] #![feature(nll)] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] #![feature(adt_const_params)] #![allow(incomplete_features)] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_expand/src/lib.rs b/compiler/rustc_expand/src/lib.rs index 43a310f4eaf..b024524aa29 100644 --- a/compiler/rustc_expand/src/lib.rs +++ b/compiler/rustc_expand/src/lib.rs @@ -9,7 +9,7 @@ #![feature(proc_macro_span)] #![feature(try_blocks)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_incremental/src/lib.rs b/compiler/rustc_incremental/src/lib.rs index b4df3e1e396..01711345966 100644 --- a/compiler/rustc_incremental/src/lib.rs +++ b/compiler/rustc_incremental/src/lib.rs @@ -5,7 +5,7 @@ #![feature(let_else)] #![feature(nll)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_middle; diff --git a/compiler/rustc_infer/src/lib.rs b/compiler/rustc_infer/src/lib.rs index ae79e14db18..4960630051f 100644 --- a/compiler/rustc_infer/src/lib.rs +++ b/compiler/rustc_infer/src/lib.rs @@ -23,7 +23,7 @@ #![feature(min_specialization)] #![feature(label_break_value)] #![recursion_limit = "512"] // For rustdoc -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_interface/src/lib.rs b/compiler/rustc_interface/src/lib.rs index dcad3036cc2..f847c08a9dc 100644 --- a/compiler/rustc_interface/src/lib.rs +++ b/compiler/rustc_interface/src/lib.rs @@ -6,7 +6,7 @@ #![feature(nll)] #![feature(once_cell)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] mod callbacks; pub mod interface; diff --git a/compiler/rustc_lint/src/context.rs b/compiler/rustc_lint/src/context.rs index ac0f4bd8a4d..0582a4e01bf 100644 --- a/compiler/rustc_lint/src/context.rs +++ b/compiler/rustc_lint/src/context.rs @@ -147,7 +147,7 @@ impl LintStore { &'t self, ) -> impl Iterator<Item = (&'static str, Vec<LintId>, bool)> + 't { // This function is not used in a way which observes the order of lints. - #[cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] + #[allow(rustc::potential_query_instability)] self.lint_groups .iter() .filter(|(_, LintGroup { depr, .. })| { diff --git a/compiler/rustc_lint/src/lib.rs b/compiler/rustc_lint/src/lib.rs index 7182022d252..a40453eb22a 100644 --- a/compiler/rustc_lint/src/lib.rs +++ b/compiler/rustc_lint/src/lib.rs @@ -38,7 +38,7 @@ #![feature(nll)] #![feature(control_flow_enum)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_middle; diff --git a/compiler/rustc_metadata/src/lib.rs b/compiler/rustc_metadata/src/lib.rs index 046245080de..06658aadbac 100644 --- a/compiler/rustc_metadata/src/lib.rs +++ b/compiler/rustc_metadata/src/lib.rs @@ -9,7 +9,7 @@ #![feature(try_blocks)] #![feature(never_type)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] extern crate proc_macro; diff --git a/compiler/rustc_middle/src/lib.rs b/compiler/rustc_middle/src/lib.rs index d3de54b4950..7ca564f29e6 100644 --- a/compiler/rustc_middle/src/lib.rs +++ b/compiler/rustc_middle/src/lib.rs @@ -57,7 +57,7 @@ #![feature(unwrap_infallible)] #![feature(decl_macro)] #![recursion_limit = "512"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate bitflags; diff --git a/compiler/rustc_middle/src/ty/consts.rs b/compiler/rustc_middle/src/ty/consts.rs index a794a8c0e08..b753c6238e1 100644 --- a/compiler/rustc_middle/src/ty/consts.rs +++ b/compiler/rustc_middle/src/ty/consts.rs @@ -21,7 +21,7 @@ pub use valtree::*; /// Use this rather than `ConstS`, whenever possible. #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, HashStable)] -#[cfg_attr(not(bootstrap), rustc_pass_by_value)] +#[rustc_pass_by_value] pub struct Const<'tcx>(pub Interned<'tcx, ConstS<'tcx>>); impl<'tcx> fmt::Debug for Const<'tcx> { diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 7a6a6a00cc7..19d8856dc6c 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -970,7 +970,7 @@ pub struct FreeRegionInfo { /// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/ty.html #[derive(Copy, Clone)] #[rustc_diagnostic_item = "TyCtxt"] -#[cfg_attr(not(bootstrap), rustc_pass_by_value)] +#[rustc_pass_by_value] pub struct TyCtxt<'tcx> { gcx: &'tcx GlobalCtxt<'tcx>, } diff --git a/compiler/rustc_middle/src/ty/mod.rs b/compiler/rustc_middle/src/ty/mod.rs index f0b7f2a653f..88c993d98e2 100644 --- a/compiler/rustc_middle/src/ty/mod.rs +++ b/compiler/rustc_middle/src/ty/mod.rs @@ -433,7 +433,7 @@ static_assert_size!(TyS<'_>, 40); /// Use this rather than `TyS`, whenever possible. #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] #[rustc_diagnostic_item = "Ty"] -#[cfg_attr(not(bootstrap), rustc_pass_by_value)] +#[rustc_pass_by_value] pub struct Ty<'tcx>(Interned<'tcx, TyS<'tcx>>); // Statics only used for internal testing. @@ -486,7 +486,7 @@ static_assert_size!(PredicateS<'_>, 56); /// Use this rather than `PredicateS`, whenever possible. #[derive(Clone, Copy, PartialEq, Eq, Hash)] -#[cfg_attr(not(bootstrap), rustc_pass_by_value)] +#[rustc_pass_by_value] pub struct Predicate<'tcx>(Interned<'tcx, PredicateS<'tcx>>); impl<'tcx> Predicate<'tcx> { diff --git a/compiler/rustc_middle/src/ty/sty.rs b/compiler/rustc_middle/src/ty/sty.rs index 02a4df637d8..a1e906140e0 100644 --- a/compiler/rustc_middle/src/ty/sty.rs +++ b/compiler/rustc_middle/src/ty/sty.rs @@ -1396,7 +1396,7 @@ impl ParamConst { /// Use this rather than `TyKind`, whenever possible. #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, HashStable)] -#[cfg_attr(not(bootstrap), rustc_pass_by_value)] +#[rustc_pass_by_value] pub struct Region<'tcx>(pub Interned<'tcx, RegionKind>); impl<'tcx> Deref for Region<'tcx> { diff --git a/compiler/rustc_mir_build/src/lib.rs b/compiler/rustc_mir_build/src/lib.rs index 12ea740d48a..9dea67e1762 100644 --- a/compiler/rustc_mir_build/src/lib.rs +++ b/compiler/rustc_mir_build/src/lib.rs @@ -9,7 +9,7 @@ #![feature(once_cell)] #![feature(min_specialization)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs index e7d5bab8fd9..c0c66daffa8 100644 --- a/compiler/rustc_mir_transform/src/lib.rs +++ b/compiler/rustc_mir_transform/src/lib.rs @@ -10,7 +10,7 @@ #![feature(trusted_step)] #![feature(try_blocks)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_monomorphize/src/lib.rs b/compiler/rustc_monomorphize/src/lib.rs index bbc65b09ece..c9accbcd86e 100644 --- a/compiler/rustc_monomorphize/src/lib.rs +++ b/compiler/rustc_monomorphize/src/lib.rs @@ -4,7 +4,7 @@ #![feature(control_flow_enum)] #![feature(let_else)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_passes/src/lib.rs b/compiler/rustc_passes/src/lib.rs index 3130513c40e..71381f1d869 100644 --- a/compiler/rustc_passes/src/lib.rs +++ b/compiler/rustc_passes/src/lib.rs @@ -13,7 +13,7 @@ #![feature(nll)] #![feature(try_blocks)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_middle; diff --git a/compiler/rustc_privacy/src/lib.rs b/compiler/rustc_privacy/src/lib.rs index 3dd9995fa00..b56cb86a18c 100644 --- a/compiler/rustc_privacy/src/lib.rs +++ b/compiler/rustc_privacy/src/lib.rs @@ -4,7 +4,7 @@ #![feature(try_blocks)] #![feature(associated_type_defaults)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] use rustc_ast::MacroDef; use rustc_attr as attr; diff --git a/compiler/rustc_query_impl/src/lib.rs b/compiler/rustc_query_impl/src/lib.rs index 832540a85e7..6ebff5388f4 100644 --- a/compiler/rustc_query_impl/src/lib.rs +++ b/compiler/rustc_query_impl/src/lib.rs @@ -7,7 +7,7 @@ #![feature(once_cell)] #![feature(rustc_attrs)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_query_system/src/lib.rs b/compiler/rustc_query_system/src/lib.rs index 750ac76a771..6b70e9342fa 100644 --- a/compiler/rustc_query_system/src/lib.rs +++ b/compiler/rustc_query_system/src/lib.rs @@ -5,7 +5,7 @@ #![feature(let_else)] #![feature(min_specialization)] #![feature(extern_types)] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index 4823b889207..0c386ebc49e 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -18,7 +18,7 @@ #![feature(nll)] #![recursion_limit = "256"] #![allow(rustdoc::private_intra_doc_links)] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/compiler/rustc_save_analysis/src/lib.rs b/compiler/rustc_save_analysis/src/lib.rs index 43ec35a8434..cf71f9b3fc5 100644 --- a/compiler/rustc_save_analysis/src/lib.rs +++ b/compiler/rustc_save_analysis/src/lib.rs @@ -3,7 +3,7 @@ #![feature(nll)] #![feature(let_else)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] mod dump_visitor; mod dumper; diff --git a/compiler/rustc_session/src/lib.rs b/compiler/rustc_session/src/lib.rs index 82a95faa347..f9574cb1a3b 100644 --- a/compiler/rustc_session/src/lib.rs +++ b/compiler/rustc_session/src/lib.rs @@ -4,7 +4,7 @@ #![feature(min_specialization)] #![feature(once_cell)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index e51030eedf8..9d4c2e3bb84 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -22,7 +22,7 @@ #![feature(negative_impls)] #![feature(nll)] #![feature(min_specialization)] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_span/src/span_encoding.rs b/compiler/rustc_span/src/span_encoding.rs index 61e4074a7c8..cd382d6c956 100644 --- a/compiler/rustc_span/src/span_encoding.rs +++ b/compiler/rustc_span/src/span_encoding.rs @@ -61,15 +61,8 @@ use rustc_data_structures::fx::FxIndexSet; /// using the callback `SPAN_TRACK` to access the query engine. /// #[derive(Clone, Copy, Eq, PartialEq, Hash)] -// FIXME(@lcnr): Enable this attribute once the bootstrap -// compiler knows of `rustc_pass_by_value`. -// -// Right now, this lint would only trigger when compiling the -// stage 2 compiler, which is fairly annoying as there are -// a lot of places using `&Span` right now. After the next bootstrap bump, -// the lint will already trigger when using stage 1, which is a lot less annoying. -// -// #[cfg_attr(not(bootstrap), rustc_pass_by_value)] +// FIXME: Enable this in the bootstrap bump, but separate commit. +// #[rustc_pass_by_value] pub struct Span { base_or_index: u32, len_or_tag: u16, diff --git a/compiler/rustc_symbol_mangling/src/lib.rs b/compiler/rustc_symbol_mangling/src/lib.rs index f4d1f41902a..3b60f91f8c8 100644 --- a/compiler/rustc_symbol_mangling/src/lib.rs +++ b/compiler/rustc_symbol_mangling/src/lib.rs @@ -91,7 +91,7 @@ #![feature(never_type)] #![feature(nll)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_middle; diff --git a/compiler/rustc_trait_selection/src/lib.rs b/compiler/rustc_trait_selection/src/lib.rs index 0041f596405..5569334ff3d 100644 --- a/compiler/rustc_trait_selection/src/lib.rs +++ b/compiler/rustc_trait_selection/src/lib.rs @@ -22,7 +22,7 @@ #![feature(crate_visibility_modifier)] #![feature(control_flow_enum)] #![recursion_limit = "512"] // For rustdoc -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate rustc_macros; diff --git a/compiler/rustc_typeck/src/lib.rs b/compiler/rustc_typeck/src/lib.rs index d415e37ff01..40904c1dfd6 100644 --- a/compiler/rustc_typeck/src/lib.rs +++ b/compiler/rustc_typeck/src/lib.rs @@ -69,7 +69,7 @@ This API is completely unstable and subject to change. #![feature(control_flow_enum)] #![feature(hash_drain_filter)] #![recursion_limit = "256"] -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 6da32df57ef..82493f9c398 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -139,7 +139,6 @@ #![feature(associated_type_bounds)] #![feature(box_syntax)] #![feature(cfg_sanitize)] -#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))] #![feature(const_deref)] #![feature(const_fn_trait_bound)] #![feature(const_mut_refs)] diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs index b5228397f0a..1d457c2b7d5 100644 --- a/library/core/src/intrinsics.rs +++ b/library/core/src/intrinsics.rs @@ -1936,7 +1936,6 @@ extern "rust-intrinsic" { /// - If the `ptr` is created in an another const, this intrinsic doesn't deallocate it. /// - If the `ptr` is pointing to a local variable, this intrinsic doesn't deallocate it. #[rustc_const_unstable(feature = "const_heap", issue = "79597")] - #[cfg(not(bootstrap))] pub fn const_deallocate(ptr: *mut u8, size: usize, align: usize); /// Determines whether the raw bytes of the two values are equal. diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index aa1ad9362a9..e7896b2cb66 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -156,7 +156,7 @@ #![feature(associated_type_bounds)] #![feature(auto_traits)] #![feature(cfg_target_has_atomic)] -#![cfg_attr(not(bootstrap), feature(cfg_target_has_atomic_equal_alignment))] +#![feature(cfg_target_has_atomic_equal_alignment)] #![feature(const_fn_floating_point_arithmetic)] #![feature(const_fn_fn_ptr_basics)] #![feature(const_fn_trait_bound)] diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs index 628b679236e..65a2c3ff6ed 100644 --- a/library/core/src/macros/mod.rs +++ b/library/core/src/macros/mod.rs @@ -594,7 +594,6 @@ macro_rules! writeln { /// unreachable!("The loop should always return"); /// } /// ``` -#[cfg(not(bootstrap))] #[macro_export] #[rustc_builtin_macro(unreachable)] #[allow_internal_unstable(edition_panic)] @@ -608,24 +607,6 @@ macro_rules! unreachable { }; } -/// unreachable!() macro -#[cfg(bootstrap)] -#[macro_export] -#[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(test), rustc_diagnostic_item = "unreachable_macro")] -#[allow_internal_unstable(core_panic)] -macro_rules! unreachable { - () => ({ - $crate::panicking::panic("internal error: entered unreachable code") - }); - ($msg:expr $(,)?) => ({ - $crate::unreachable!("{}", $msg) - }); - ($fmt:expr, $($arg:tt)*) => ({ - $crate::panic!($crate::concat!("internal error: entered unreachable code: ", $fmt), $($arg)*) - }); -} - /// Indicates unimplemented code by panicking with a message of "not implemented". /// /// This allows your code to type-check, which is useful if you are prototyping or diff --git a/library/core/src/panicking.rs b/library/core/src/panicking.rs index 2b720fc4192..91458a4ca2a 100644 --- a/library/core/src/panicking.rs +++ b/library/core/src/panicking.rs @@ -56,7 +56,6 @@ pub const fn panic_str(expr: &str) -> ! { panic_display(&expr); } -#[cfg(not(bootstrap))] #[inline] #[track_caller] #[rustc_diagnostic_item = "unreachable_display"] // needed for `non-fmt-panics` lint @@ -85,7 +84,6 @@ fn panic_bounds_check(index: usize, len: usize) -> ! { panic!("index out of bounds: the len is {} but the index is {}", len, index) } -#[cfg(not(bootstrap))] #[cold] #[inline(never)] #[lang = "panic_no_unwind"] // needed by codegen for panic in nounwind function diff --git a/library/core/tests/intrinsics.rs b/library/core/tests/intrinsics.rs index e050e810375..06870c6d06c 100644 --- a/library/core/tests/intrinsics.rs +++ b/library/core/tests/intrinsics.rs @@ -80,7 +80,6 @@ fn test_hints_in_const_contexts() { } } -#[cfg(not(bootstrap))] #[test] fn test_const_allocate_at_runtime() { use core::intrinsics::const_allocate; @@ -89,7 +88,6 @@ fn test_const_allocate_at_runtime() { } } -#[cfg(not(bootstrap))] #[test] fn test_const_deallocate_at_runtime() { use core::intrinsics::const_deallocate; diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index 06c7be054a0..28830222c1a 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -6,8 +6,6 @@ #![feature(bool_to_option)] #![feature(box_syntax)] #![feature(cell_update)] -#![cfg_attr(bootstrap, feature(cfg_panic))] -#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))] #![feature(const_assume)] #![feature(const_black_box)] #![feature(const_bool_to_option)] diff --git a/library/portable-simd/crates/core_simd/src/intrinsics.rs b/library/portable-simd/crates/core_simd/src/intrinsics.rs index 233657202f7..2291400537c 100644 --- a/library/portable-simd/crates/core_simd/src/intrinsics.rs +++ b/library/portable-simd/crates/core_simd/src/intrinsics.rs @@ -41,7 +41,6 @@ extern "platform-intrinsic" { pub(crate) fn simd_cast<T, U>(x: T) -> U; /// follows Rust's `T as U` semantics, including saturating float casts /// which amounts to the same as `simd_cast` for many cases - #[cfg(not(bootstrap))] pub(crate) fn simd_as<T, U>(x: T) -> U; /// neg/fneg diff --git a/library/portable-simd/crates/core_simd/src/vector.rs b/library/portable-simd/crates/core_simd/src/vector.rs index b7ef7a56c73..35c5b6b84f8 100644 --- a/library/portable-simd/crates/core_simd/src/vector.rs +++ b/library/portable-simd/crates/core_simd/src/vector.rs @@ -62,10 +62,7 @@ where /// `from_slice` will panic if the slice's `len` is less than the vector's `Simd::LANES`. #[must_use] pub const fn from_slice(slice: &[T]) -> Self { - assert!( - slice.len() >= LANES, - "slice length must be at least the number of lanes" - ); + assert!(slice.len() >= LANES, "slice length must be at least the number of lanes"); let mut array = [slice[0]; LANES]; let mut i = 0; while i < LANES { @@ -100,7 +97,6 @@ where /// ``` #[must_use] #[inline] - #[cfg(not(bootstrap))] pub fn cast<U: SimdElement>(self) -> Simd<U, LANES> { unsafe { intrinsics::simd_as(self) } } diff --git a/library/std/src/collections/hash/map.rs b/library/std/src/collections/hash/map.rs index 53b43455b5a..c0524352193 100644 --- a/library/std/src/collections/hash/map.rs +++ b/library/std/src/collections/hash/map.rs @@ -371,7 +371,7 @@ impl<K, V, S> HashMap<K, V, S> { /// assert_eq!(vec, ["a", "b", "c"]); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "map_into_keys_values", since = "1.54.0")] pub fn into_keys(self) -> IntoKeys<K, V> { IntoKeys { inner: self.into_iter() } @@ -449,7 +449,7 @@ impl<K, V, S> HashMap<K, V, S> { /// assert_eq!(vec, [1, 2, 3]); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "map_into_keys_values", since = "1.54.0")] pub fn into_values(self) -> IntoValues<K, V> { IntoValues { inner: self.into_iter() } @@ -473,7 +473,7 @@ impl<K, V, S> HashMap<K, V, S> { /// println!("key: {} val: {}", key, val); /// } /// ``` - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn iter(&self) -> Iter<'_, K, V> { Iter { base: self.base.iter() } @@ -503,7 +503,7 @@ impl<K, V, S> HashMap<K, V, S> { /// println!("key: {} val: {}", key, val); /// } /// ``` - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn iter_mut(&mut self) -> IterMut<'_, K, V> { IterMut { base: self.base.iter_mut() } @@ -568,7 +568,7 @@ impl<K, V, S> HashMap<K, V, S> { /// assert!(a.is_empty()); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "drain", since = "1.6.0")] pub fn drain(&mut self) -> Drain<'_, K, V> { Drain { base: self.base.drain() } @@ -610,7 +610,7 @@ impl<K, V, S> HashMap<K, V, S> { /// assert_eq!(odds, vec![1, 3, 5, 7]); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[unstable(feature = "hash_drain_filter", issue = "59618")] pub fn drain_filter<F>(&mut self, pred: F) -> DrainFilter<'_, K, V, F> where @@ -634,7 +634,7 @@ impl<K, V, S> HashMap<K, V, S> { /// assert_eq!(map.len(), 4); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "retain_hash_collection", since = "1.18.0")] pub fn retain<F>(&mut self, f: F) where @@ -2001,7 +2001,7 @@ impl<'a, K, V, S> IntoIterator for &'a HashMap<K, V, S> { type IntoIter = Iter<'a, K, V>; #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] fn into_iter(self) -> Iter<'a, K, V> { self.iter() } @@ -2013,7 +2013,7 @@ impl<'a, K, V, S> IntoIterator for &'a mut HashMap<K, V, S> { type IntoIter = IterMut<'a, K, V>; #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] fn into_iter(self) -> IterMut<'a, K, V> { self.iter_mut() } @@ -2043,7 +2043,7 @@ impl<K, V, S> IntoIterator for HashMap<K, V, S> { /// let vec: Vec<(&str, i32)> = map.into_iter().collect(); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] fn into_iter(self) -> IntoIter<K, V> { IntoIter { base: self.base.into_iter() } } diff --git a/library/std/src/collections/hash/set.rs b/library/std/src/collections/hash/set.rs index 200667ae390..2eb4cacabb8 100644 --- a/library/std/src/collections/hash/set.rs +++ b/library/std/src/collections/hash/set.rs @@ -185,7 +185,7 @@ impl<T, S> HashSet<T, S> { /// } /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn iter(&self) -> Iter<'_, T> { Iter { base: self.base.iter() } @@ -250,7 +250,7 @@ impl<T, S> HashSet<T, S> { /// assert!(set.is_empty()); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "drain", since = "1.6.0")] pub fn drain(&mut self) -> Drain<'_, T> { Drain { base: self.base.drain() } @@ -289,7 +289,7 @@ impl<T, S> HashSet<T, S> { /// assert_eq!(odds, vec![1, 3, 5, 7]); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[unstable(feature = "hash_drain_filter", issue = "59618")] pub fn drain_filter<F>(&mut self, pred: F) -> DrainFilter<'_, T, F> where @@ -312,7 +312,7 @@ impl<T, S> HashSet<T, S> { /// set.retain(|&k| k % 2 == 0); /// assert_eq!(set.len(), 3); /// ``` - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "retain_hash_collection", since = "1.18.0")] pub fn retain<F>(&mut self, f: F) where @@ -537,7 +537,7 @@ where /// assert_eq!(diff, [4].iter().collect()); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn difference<'a>(&'a self, other: &'a HashSet<T, S>) -> Difference<'a, T, S> { Difference { iter: self.iter(), other } @@ -565,7 +565,7 @@ where /// assert_eq!(diff1, [1, 4].iter().collect()); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn symmetric_difference<'a>( &'a self, @@ -593,7 +593,7 @@ where /// assert_eq!(intersection, [2, 3].iter().collect()); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn intersection<'a>(&'a self, other: &'a HashSet<T, S>) -> Intersection<'a, T, S> { if self.len() <= other.len() { @@ -622,7 +622,7 @@ where /// assert_eq!(union, [1, 2, 3, 4].iter().collect()); /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] #[stable(feature = "rust1", since = "1.0.0")] pub fn union<'a>(&'a self, other: &'a HashSet<T, S>) -> Union<'a, T, S> { if self.len() >= other.len() { @@ -1423,7 +1423,7 @@ impl<'a, T, S> IntoIterator for &'a HashSet<T, S> { type IntoIter = Iter<'a, T>; #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] fn into_iter(self) -> Iter<'a, T> { self.iter() } @@ -1455,7 +1455,7 @@ impl<T, S> IntoIterator for HashSet<T, S> { /// } /// ``` #[inline] - #[cfg_attr(not(bootstrap), rustc_lint_query_instability)] + #[rustc_lint_query_instability] fn into_iter(self) -> IntoIter<T> { IntoIter { base: self.base.into_iter() } } diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 5dc586d3a2a..1e0d9b79b9f 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -243,7 +243,6 @@ #![feature(c_variadic)] #![feature(cfg_accessible)] #![feature(cfg_eval)] -#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))] #![feature(cfg_target_thread_local)] #![feature(char_error_internals)] #![feature(char_internals)] diff --git a/library/test/src/tests.rs b/library/test/src/tests.rs index e99089e453e..8329e9735d4 100644 --- a/library/test/src/tests.rs +++ b/library/test/src/tests.rs @@ -67,8 +67,6 @@ fn one_ignored_one_unignored_test() -> Vec<TestDescAndFn> { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(move || {})), }, @@ -82,8 +80,6 @@ fn one_ignored_one_unignored_test() -> Vec<TestDescAndFn> { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(move || {})), }, @@ -105,8 +101,6 @@ pub fn do_not_run_ignored_tests() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -129,8 +123,6 @@ pub fn ignored_tests_result_in_ignored() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -157,8 +149,6 @@ fn test_should_panic() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -185,8 +175,6 @@ fn test_should_panic_good_message() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -218,8 +206,6 @@ fn test_should_panic_bad_message() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -255,8 +241,6 @@ fn test_should_panic_non_string_message_type() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -284,8 +268,6 @@ fn test_should_panic_but_succeeds() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -321,8 +303,6 @@ fn report_time_test_template(report_time: bool) -> Option<TestExecTime> { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -359,8 +339,6 @@ fn time_test_failure_template(test_type: TestType) -> TestResult { compile_fail: false, no_run: false, test_type, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(f)), }; @@ -401,8 +379,6 @@ fn typed_test_desc(test_type: TestType) -> TestDesc { compile_fail: false, no_run: false, test_type, - #[cfg(bootstrap)] - allow_fail: false, } } @@ -516,8 +492,6 @@ pub fn exclude_should_panic_option() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(move || {})), }); @@ -543,8 +517,6 @@ pub fn exact_filter_match() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(move || {})), }) @@ -635,8 +607,6 @@ fn sample_tests() -> Vec<TestDescAndFn> { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: DynTestFn(Box::new(testfn)), }; @@ -789,8 +759,6 @@ pub fn test_bench_no_iter() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }; crate::bench::benchmark(TestId(0), desc, tx, true, f); @@ -814,8 +782,6 @@ pub fn test_bench_iter() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }; crate::bench::benchmark(TestId(0), desc, tx, true, f); @@ -833,8 +799,6 @@ fn should_sort_failures_before_printing_them() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }; let test_b = TestDesc { @@ -846,8 +810,6 @@ fn should_sort_failures_before_printing_them() { compile_fail: false, no_run: false, test_type: TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, }; let mut out = PrettyFormatter::new(OutputLocation::Raw(Vec::new()), false, 10, false, None); diff --git a/library/test/src/types.rs b/library/test/src/types.rs index cc75220aa00..1084fb98389 100644 --- a/library/test/src/types.rs +++ b/library/test/src/types.rs @@ -123,8 +123,6 @@ pub struct TestDesc { pub compile_fail: bool, pub no_run: bool, pub test_type: TestType, - #[cfg(bootstrap)] - pub allow_fail: bool, } impl TestDesc { diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs index dc9ce052cb5..eabf10eda97 100644 --- a/src/librustdoc/doctest.rs +++ b/src/librustdoc/doctest.rs @@ -953,8 +953,6 @@ impl Tester for Collector { compile_fail: config.compile_fail, no_run, test_type: test::TestType::DocTest, - #[cfg(bootstrap)] - allow_fail: false, }, testfn: test::DynTestFn(box move || { let report_unused_externs = |uext| { diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 9d3e58a3a66..f4cb9352464 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -22,6 +22,7 @@ #![recursion_limit = "256"] #![warn(rustc::internal)] #![allow(clippy::collapsible_if, clippy::collapsible_else_if)] +#![allow(rustc::potential_query_instability)] #[macro_use] extern crate tracing; diff --git a/src/tools/clippy/clippy_lints/src/lib.rs b/src/tools/clippy/clippy_lints/src/lib.rs index 5c45012ef06..85256ff0e99 100644 --- a/src/tools/clippy/clippy_lints/src/lib.rs +++ b/src/tools/clippy/clippy_lints/src/lib.rs @@ -18,7 +18,7 @@ // warn on rustc internal lints #![warn(rustc::internal)] // Disable this rustc lint for now, as it was also done in rustc -#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))] +#![allow(rustc::potential_query_instability)] // FIXME: switch to something more ergonomic here, once available. // (Currently there is no way to opt into sysroot crates without `extern crate`.) diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 2c2239f2b83..1bdea33dffa 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -885,8 +885,6 @@ pub fn make_test_description<R: Read>( compile_fail: false, no_run: false, test_type: test::TestType::Unknown, - #[cfg(bootstrap)] - allow_fail: false, } } |