Stabilize assert_matches and move it to core::macros

compiler/rustc_abi/src/extern_abi/tests.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::str::FromStr;
 

compiler/rustc_abi/src/lib.rs

@@ -1,6 +1,6 @@
 // tidy-alphabetical-start
 #![cfg_attr(feature = "nightly", allow(internal_features))]
-#![cfg_attr(feature = "nightly", feature(assert_matches))]
+#![cfg_attr(all(feature = "nightly", bootstrap), feature(assert_matches))]
 #![cfg_attr(feature = "nightly", feature(rustc_attrs))]
 #![cfg_attr(feature = "nightly", feature(step_trait))]
 // tidy-alphabetical-end

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

@@ -3,6 +3,9 @@
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use rustc_errors::{Applicability, Diag, EmissionGuarantee};

compiler/rustc_borrowck/src/lib.rs

@@ -2,7 +2,7 @@
 
 // tidy-alphabetical-start
 #![allow(internal_features)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(box_patterns)]
 #![feature(file_buffered)]
 #![feature(if_let_guard)]

compiler/rustc_borrowck/src/type_check/input_output.rs

@@ -7,6 +7,9 @@
 //! `RETURN_PLACE` the MIR arguments) are always fully normalized (and
 //! contain revealed `impl Trait` values).
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use itertools::Itertools;

compiler/rustc_builtin_macros/src/lib.rs

@@ -5,7 +5,7 @@
 #![allow(internal_features)]
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(box_patterns)]
 #![feature(decl_macro)]
 #![feature(if_let_guard)]

compiler/rustc_builtin_macros/src/test.rs

@@ -1,6 +1,9 @@
 //! The expansion from a test function to the appropriate test struct for libtest
 //! Ideally, this code would be in libtest but for efficiency and error messages it lives here.
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::iter;
 

compiler/rustc_codegen_llvm/src/asm.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use rustc_abi::{BackendRepr, Float, Integer, Primitive, Scalar};

compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::sync::Arc;
 

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::cmp::Ordering;
 use std::ffi::c_uint;

compiler/rustc_codegen_llvm/src/lib.rs

@@ -5,7 +5,7 @@
 //! This API is completely unstable and subject to change.
 
 // tidy-alphabetical-start
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(extern_types)]
 #![feature(file_buffered)]
 #![feature(if_let_guard)]

compiler/rustc_codegen_ssa/src/back/write.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::marker::PhantomData;
 use std::panic::AssertUnwindSafe;

compiler/rustc_codegen_ssa/src/lib.rs

@@ -1,7 +1,7 @@
 // tidy-alphabetical-start
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(box_patterns)]
 #![feature(file_buffered)]
 #![feature(if_let_guard)]

compiler/rustc_codegen_ssa/src/traits/builder.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::ops::Deref;
 

compiler/rustc_const_eval/src/check_consts/check.rs

@@ -1,5 +1,8 @@
 //! The `Visitor` responsible for actually checking a `mir::Body` for invalid operations.
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::borrow::Cow;
 use std::mem;

compiler/rustc_const_eval/src/interpret/call.rs

@@ -1,5 +1,8 @@
 //! Manages calling a concrete function (with known MIR body) with argument passing,
 //! and returning the return value to the caller.
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::borrow::Cow;
 

compiler/rustc_const_eval/src/interpret/cast.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use rustc_abi::{FieldIdx, Integer};

compiler/rustc_const_eval/src/interpret/eval_context.rs

@@ -1,4 +1,7 @@
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 
 use either::{Left, Right};
 use rustc_abi::{Align, HasDataLayout, Size, TargetDataLayout};

compiler/rustc_const_eval/src/interpret/intrinsics.rs

@@ -4,6 +4,9 @@
 
 mod simd;
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use rustc_abi::{FIRST_VARIANT, FieldIdx, HasDataLayout, Size, VariantIdx};

compiler/rustc_const_eval/src/interpret/memory.rs

@@ -6,6 +6,9 @@
 //! integer. It is crucial that these operations call `check_align` *before*
 //! short-circuiting the empty case!
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::borrow::{Borrow, Cow};
 use std::cell::Cell;

compiler/rustc_const_eval/src/interpret/operand.rs

@@ -1,6 +1,9 @@
 //! Functions concerning immediate values and operands, and reading from operands.
 //! All high-level functions to read from memory work on operands as sources.
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use either::{Either, Left, Right};

compiler/rustc_const_eval/src/interpret/place.rs

@@ -2,6 +2,9 @@
 //! into a place.
 //! All high-level functions to write to memory work on places as destinations.
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use either::{Either, Left, Right};

compiler/rustc_const_eval/src/lib.rs

@@ -1,7 +1,7 @@
 // tidy-alphabetical-start
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![feature(array_try_map)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(box_patterns)]
 #![feature(decl_macro)]
 #![feature(if_let_guard)]

compiler/rustc_data_structures/src/graph/scc/mod.rs

@@ -8,7 +8,10 @@
 //! Typical examples would include: minimum element in SCC, maximum element
 //! reachable from it, etc.
 
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::ops::Range;

compiler/rustc_data_structures/src/lib.rs

@@ -15,7 +15,7 @@
 #![feature(allocator_api)]
 #![feature(ascii_char)]
 #![feature(ascii_char_variants)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(auto_traits)]
 #![feature(cfg_select)]
 #![feature(core_intrinsics)]

compiler/rustc_errors/src/lib.rs

@@ -8,7 +8,7 @@
 #![allow(rustc::direct_use_of_rustc_type_ir)]
 #![allow(rustc::untranslatable_diagnostic)]
 #![cfg_attr(bootstrap, feature(array_windows))]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(associated_type_defaults)]
 #![feature(box_patterns)]
 #![feature(default_field_values)]
@@ -23,6 +23,9 @@
 
 extern crate self as rustc_errors;
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::backtrace::{Backtrace, BacktraceStatus};
 use std::borrow::Cow;

compiler/rustc_hir_analysis/src/collect.rs

@@ -14,6 +14,9 @@
 //! At present, however, we do run collection across all items in the
 //! crate as a kind of pass. This should eventually be factored away.
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::cell::Cell;
 use std::iter;

compiler/rustc_hir_analysis/src/collect/generics_of.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::ops::ControlFlow;
 

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use hir::Node;

compiler/rustc_hir_analysis/src/delegation.rs

@@ -2,7 +2,10 @@
 //!
 //! For more information about delegation design, see the tracking issue #118212.
 
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def::DefKind;

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -19,6 +19,9 @@ mod dyn_trait;
 pub mod errors;
 pub mod generics;
 
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::slice;
 

compiler/rustc_hir_analysis/src/impl_wf_check.rs

@@ -8,7 +8,10 @@
 //! specialization errors. These things can (and probably should) be
 //! fixed, but for the moment it's easier to do these checks early.
 
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 
 use min_specialization::check_min_specialization;
 use rustc_data_structures::fx::FxHashSet;

compiler/rustc_hir_analysis/src/lib.rs

@@ -58,7 +58,7 @@ This API is completely unstable and subject to change.
 // tidy-alphabetical-start
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(gen_blocks)]
 #![feature(if_let_guard)]
 #![feature(iter_intersperse)]

compiler/rustc_hir_typeck/src/lib.rs

@@ -1,5 +1,5 @@
 // tidy-alphabetical-start
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(box_patterns)]
 #![feature(if_let_guard)]
 #![feature(iter_intersperse)]

compiler/rustc_hir_typeck/src/method/probe.rs

@@ -1,6 +1,9 @@
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
 use std::cell::{Cell, RefCell};
 use std::cmp::max;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 use std::ops::Deref;
 
 use rustc_data_structures::fx::FxHashSet;

compiler/rustc_infer/src/infer/outlives/verify.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use rustc_middle::ty::outlives::{Component, compute_alias_components_recursive};

compiler/rustc_infer/src/infer/snapshot/undo_log.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::marker::PhantomData;
 

compiler/rustc_infer/src/lib.rs

@@ -14,7 +14,7 @@
 
 // tidy-alphabetical-start
 #![allow(rustc::direct_use_of_rustc_type_ir)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(extend_one)]
 #![recursion_limit = "512"] // For rustdoc
 // tidy-alphabetical-end

compiler/rustc_lint/src/impl_trait_overcaptures.rs

@@ -1,5 +1,8 @@
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
 use std::cell::LazyCell;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 
 use rustc_data_structures::fx::{FxHashMap, FxIndexMap, FxIndexSet};
 use rustc_data_structures::unord::UnordSet;

compiler/rustc_lint/src/lib.rs

@@ -22,7 +22,7 @@
 // tidy-alphabetical-start
 #![allow(internal_features)]
 #![cfg_attr(bootstrap, feature(array_windows))]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(box_patterns)]
 #![feature(if_let_guard)]
 #![feature(iter_order_by)]

compiler/rustc_middle/src/lib.rs

@@ -31,7 +31,7 @@
 #![allow(rustc::untranslatable_diagnostic)]
 #![cfg_attr(bootstrap, feature(array_windows))]
 #![feature(allocator_api)]
-#![feature(assert_matches)]
+#![cfg_attr(bootstrap, feature(assert_matches))]
 #![feature(associated_type_defaults)]
 #![feature(box_as_ptr)]
 #![feature(box_patterns)]

compiler/rustc_middle/src/ty/consts/kind.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 
 use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, TypeVisitable};

compiler/rustc_middle/src/ty/context.rs

@@ -4,9 +4,12 @@
 
 pub mod tls;
 
+#[cfg(bootstrap)]
 use std::assert_matches::debug_assert_matches;
 use std::borrow::{Borrow, Cow};
 use std::cmp::Ordering;
+#[cfg(not(bootstrap))]
+use std::debug_assert_matches;
 use std::env::VarError;
 use std::ffi::OsStr;
 use std::hash::{Hash, Hasher};

compiler/rustc_middle/src/ty/instance.rs

@@ -1,3 +1,6 @@
+#[cfg(not(bootstrap))]
+use std::assert_matches;
+#[cfg(bootstrap)]
 use std::assert_matches::assert_matches;
 use std::fmt;