Stabilize assert_matches and move it to core::macros

compiler/rustc_abi/src/extern_abi/tests.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 use std::str::FromStr;
 
 use super::*;

compiler/rustc_abi/src/lib.rs

@@ -1,7 +1,6 @@
 // tidy-alphabetical-start
 #![cfg_attr(feature = "nightly", allow(internal_features))]
 #![cfg_attr(feature = "nightly", doc(rust_logo))]
-#![cfg_attr(feature = "nightly", feature(assert_matches))]
 #![cfg_attr(feature = "nightly", feature(rustc_attrs))]
 #![cfg_attr(feature = "nightly", feature(rustdoc_internals))]
 #![cfg_attr(feature = "nightly", feature(step_trait))]

compiler/rustc_ast_lowering/src/expr.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 use std::ops::ControlFlow;
 use std::sync::Arc;
 

compiler/rustc_ast_lowering/src/lib.rs

@@ -33,7 +33,6 @@
 // tidy-alphabetical-start
 #![allow(internal_features)]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(if_let_guard)]
 #![feature(let_chains)]

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

@@ -3,7 +3,7 @@
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
 
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use rustc_errors::{Applicability, Diag, EmissionGuarantee};
 use rustc_hir as hir;

compiler/rustc_borrowck/src/lib.rs

@@ -3,7 +3,6 @@
 // tidy-alphabetical-start
 #![allow(internal_features)]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(file_buffered)]
 #![feature(if_let_guard)]

compiler/rustc_borrowck/src/type_check/input_output.rs

@@ -7,7 +7,7 @@
 //! `RETURN_PLACE` the MIR arguments) are always fully normalized (and
 //! contain revealed `impl Trait` values).
 
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use itertools::Itertools;
 use rustc_hir as hir;

compiler/rustc_builtin_macros/src/lib.rs

@@ -7,7 +7,6 @@
 #![allow(rustc::untranslatable_diagnostic)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(autodiff)]
 #![feature(box_patterns)]
 #![feature(decl_macro)]

compiler/rustc_builtin_macros/src/test.rs

@@ -1,8 +1,8 @@
 //! 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.
 
-use std::assert_matches::assert_matches;
 use std::iter;
+use std::macros::assert_matches;
 
 use rustc_ast::ptr::P;
 use rustc_ast::{self as ast, GenericParamKind, attr};

compiler/rustc_codegen_llvm/src/asm.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use libc::{c_char, c_uint};
 use rustc_abi::{BackendRepr, Float, Integer, Primitive, Scalar};

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -1,5 +1,5 @@
-use std::assert_matches::assert_matches;
 use std::cmp::Ordering;
+use std::macros::assert_matches;
 
 use rustc_abi::{Align, BackendRepr, ExternAbi, Float, HasDataLayout, Primitive, Size};
 use rustc_codegen_ssa::base::{compare_simd_types, wants_msvc_seh, wants_wasm_eh};

compiler/rustc_codegen_llvm/src/lib.rs

@@ -8,7 +8,6 @@
 #![allow(internal_features)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(exact_size_is_empty)]
 #![feature(extern_types)]
 #![feature(file_buffered)]

compiler/rustc_codegen_ssa/src/back/write.rs

@@ -1,5 +1,5 @@
 use std::any::Any;
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 use std::marker::PhantomData;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;

compiler/rustc_codegen_ssa/src/lib.rs

@@ -4,7 +4,6 @@
 #![allow(rustc::untranslatable_diagnostic)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(debug_closure_helpers)]
 #![feature(file_buffered)]

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use arrayvec::ArrayVec;
 use rustc_abi::{self as abi, FIRST_VARIANT, FieldIdx};

compiler/rustc_codegen_ssa/src/traits/builder.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 use std::ops::Deref;
 
 use rustc_abi::{Align, Scalar, Size, WrappingRange};

compiler/rustc_const_eval/src/check_consts/check.rs

@@ -1,7 +1,7 @@
 //! The `Visitor` responsible for actually checking a `mir::Body` for invalid operations.
 
-use std::assert_matches::assert_matches;
 use std::borrow::Cow;
+use std::macros::assert_matches;
 use std::mem;
 use std::num::NonZero;
 use std::ops::Deref;

compiler/rustc_const_eval/src/interpret/call.rs

@@ -1,7 +1,7 @@
 //! Manages calling a concrete function (with known MIR body) with argument passing,
 //! and returning the return value to the caller.
-use std::assert_matches::assert_matches;
 use std::borrow::Cow;
+use std::macros::assert_matches;
 
 use either::{Left, Right};
 use rustc_abi::{self as abi, ExternAbi, FieldIdx, Integer, VariantIdx};

compiler/rustc_const_eval/src/interpret/cast.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use rustc_abi::Integer;
 use rustc_apfloat::ieee::{Double, Half, Quad, Single};

compiler/rustc_const_eval/src/interpret/eval_context.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::debug_assert_matches;
+use std::macros::debug_assert_matches;
 
 use either::{Left, Right};
 use rustc_abi::{Align, HasDataLayout, Size, TargetDataLayout};

compiler/rustc_const_eval/src/interpret/intrinsics.rs

@@ -2,7 +2,7 @@
 //! looking at their MIR. Intrinsics/functions supported here are shared by CTFE
 //! and miri.
 
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use rustc_abi::Size;
 use rustc_apfloat::ieee::{Double, Half, Quad, Single};

compiler/rustc_const_eval/src/interpret/memory.rs

@@ -6,9 +6,9 @@
 //! integer. It is crucial that these operations call `check_align` *before*
 //! short-circuiting the empty case!
 
-use std::assert_matches::assert_matches;
 use std::borrow::{Borrow, Cow};
 use std::collections::VecDeque;
+use std::macros::assert_matches;
 use std::{fmt, mem, ptr};
 
 use rustc_abi::{Align, HasDataLayout, Size};

compiler/rustc_const_eval/src/interpret/operand.rs

@@ -1,7 +1,7 @@
 //! Functions concerning immediate values and operands, and reading from operands.
 //! All high-level functions to read from memory work on operands as sources.
 
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use either::{Either, Left, Right};
 use rustc_abi as abi;

compiler/rustc_const_eval/src/interpret/place.rs

@@ -2,7 +2,7 @@
 //! into a place.
 //! All high-level functions to write to memory work on places as destinations.
 
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use either::{Either, Left, Right};
 use rustc_abi::{BackendRepr, HasDataLayout, Size};

compiler/rustc_const_eval/src/lib.rs

@@ -2,7 +2,6 @@
 #![allow(internal_features)]
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(decl_macro)]
 #![feature(if_let_guard)]

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

@@ -8,8 +8,8 @@
 //! Typical examples would include: minimum element in SCC, maximum element
 //! reachable from it, etc.
 
-use std::assert_matches::debug_assert_matches;
 use std::fmt::Debug;
+use std::macros::debug_assert_matches;
 use std::ops::Range;
 
 use rustc_index::{Idx, IndexSlice, IndexVec};

compiler/rustc_data_structures/src/lib.rs

@@ -17,7 +17,6 @@
 #![feature(array_windows)]
 #![feature(ascii_char)]
 #![feature(ascii_char_variants)]
-#![feature(assert_matches)]
 #![feature(auto_traits)]
 #![feature(cfg_match)]
 #![feature(core_intrinsics)]

compiler/rustc_errors/src/lib.rs

@@ -10,7 +10,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
 #![feature(array_windows)]
-#![feature(assert_matches)]
 #![feature(associated_type_defaults)]
 #![feature(box_into_inner)]
 #![feature(box_patterns)]
@@ -30,14 +29,14 @@
 
 extern crate self as rustc_errors;
 
-use std::assert_matches::assert_matches;
 use std::backtrace::{Backtrace, BacktraceStatus};
 use std::borrow::Cow;
 use std::cell::Cell;
 use std::error::Report;
 use std::ffi::OsStr;
 use std::hash::Hash;
 use std::io::Write;
+use std::macros::assert_matches;
 use std::num::NonZero;
 use std::ops::DerefMut;
 use std::path::{Path, PathBuf};

compiler/rustc_hir_analysis/src/check/intrinsicck.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::debug_assert_matches;
+use std::macros::debug_assert_matches;
 
 use rustc_abi::FieldIdx;
 use rustc_ast::InlineAsmTemplatePiece;

compiler/rustc_hir_analysis/src/coherence/builtin.rs

@@ -1,8 +1,8 @@
 //! Check properties that are required by built-in traits and set
 //! up data structures required by type-checking/codegen.
 
-use std::assert_matches::assert_matches;
 use std::collections::BTreeMap;
+use std::macros::assert_matches;
 
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{ErrorGuaranteed, MultiSpan};

compiler/rustc_hir_analysis/src/collect/generics_of.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 use std::ops::ControlFlow;
 
 use hir::intravisit::{self, Visitor};

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use hir::Node;
 use rustc_data_structures::fx::FxIndexSet;

compiler/rustc_hir_analysis/src/delegation.rs

@@ -2,7 +2,7 @@
 //!
 //! For more information about delegation design, see the tracking issue #118212.
 
-use std::assert_matches::debug_assert_matches;
+use std::macros::debug_assert_matches;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def::DefKind;

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -20,7 +20,7 @@ pub mod errors;
 pub mod generics;
 mod lint;
 
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 use std::slice;
 
 use rustc_ast::TraitObjectSyntax;

compiler/rustc_hir_analysis/src/impl_wf_check.rs

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

compiler/rustc_hir_analysis/src/lib.rs

@@ -61,7 +61,6 @@ This API is completely unstable and subject to change.
 #![allow(rustc::untranslatable_diagnostic)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(coroutines)]
 #![feature(debug_closure_helpers)]
 #![feature(if_let_guard)]

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

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use rustc_middle::ty::{self, OutlivesPredicate, Ty, TyCtxt};
 use rustc_type_ir::outlives::{Component, compute_alias_components_recursive};

compiler/rustc_infer/src/lib.rs

@@ -18,7 +18,6 @@
 #![allow(rustc::untranslatable_diagnostic)]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
-#![feature(assert_matches)]
 #![feature(extend_one)]
 #![feature(iterator_try_collect)]
 #![feature(let_chains)]

compiler/rustc_lint/src/impl_trait_overcaptures.rs

@@ -1,5 +1,5 @@
-use std::assert_matches::debug_assert_matches;
 use std::cell::LazyCell;
+use std::macros::debug_assert_matches;
 
 use rustc_data_structures::fx::{FxHashMap, FxIndexMap, FxIndexSet};
 use rustc_data_structures::unord::UnordSet;

compiler/rustc_lint/src/lib.rs

@@ -24,7 +24,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
 #![feature(array_windows)]
-#![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(extract_if)]
 #![feature(if_let_guard)]

compiler/rustc_middle/src/lib.rs

@@ -33,7 +33,6 @@
 #![doc(rust_logo)]
 #![feature(allocator_api)]
 #![feature(array_windows)]
-#![feature(assert_matches)]
 #![feature(associated_type_defaults)]
 #![feature(box_as_ptr)]
 #![feature(box_patterns)]

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

@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use std::macros::assert_matches;
 
 use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, TypeVisitable};
 

compiler/rustc_middle/src/ty/context.rs

@@ -4,10 +4,10 @@
 
 pub mod tls;
 
-use std::assert_matches::{assert_matches, debug_assert_matches};
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
+use std::macros::{assert_matches, debug_assert_matches};
 use std::marker::PhantomData;
 use std::ops::{Bound, Deref};
 use std::sync::{Arc, OnceLock};

compiler/rustc_middle/src/ty/instance.rs

@@ -1,5 +1,5 @@
-use std::assert_matches::assert_matches;
 use std::fmt;
+use std::macros::assert_matches;
 use std::path::PathBuf;
 
 use rustc_data_structures::fx::FxHashMap;

compiler/rustc_middle/src/ty/mod.rs

@@ -11,9 +11,9 @@
 
 #![allow(rustc::usage_of_ty_tykind)]
 
-use std::assert_matches::assert_matches;
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
+use std::macros::assert_matches;
 use std::marker::PhantomData;
 use std::num::NonZero;
 use std::ptr::NonNull;

compiler/rustc_middle/src/ty/sty.rs

@@ -2,9 +2,9 @@
 
 #![allow(rustc::usage_of_ty_tykind)]
 
-use std::assert_matches::debug_assert_matches;
 use std::borrow::Cow;
 use std::iter;
+use std::macros::debug_assert_matches;
 use std::ops::{ControlFlow, Range};
 
 use hir::def::{CtorKind, DefKind};

compiler/rustc_mir_build/src/builder/coverageinfo.rs

@@ -1,5 +1,5 @@
-use std::assert_matches::assert_matches;
 use std::collections::hash_map::Entry;
+use std::macros::assert_matches;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_middle::mir::coverage::{BlockMarkerId, BranchSpan, CoverageInfoHi, CoverageKind};