bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Auto merge of #87195 - yaahc:move-assert_matches-again, r=oli-obk

Browse source 
rename assert_matches module

Fixes nightly breakage introduced in https://github.com/rust-lang/rust/pull/86947
This commit is contained in:
bors 2021-07-17 00:35:36 +00:00
commit 0cd12d649e
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/ich/impls_syntax.rs
View file

@ -6,7 +6,7 @@ use crate::ich::StableHashingContext;
use rustc_ast as ast; use rustc_ast as ast;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
use rustc_span::{BytePos, NormalizedPos, SourceFile}; use rustc_span::{BytePos, NormalizedPos, SourceFile};
use std::assert::assert_matches; use std::assert_matches::assert_matches;
use smallvec::SmallVec; use smallvec::SmallVec;

2
compiler/rustc_mir/src/interpret/memory.rs
View file

@ -6,7 +6,7 @@
//! integer. It is crucial that these operations call `check_align` *before* //! integer. It is crucial that these operations call `check_align` *before*
//! short-circuiting the empty case! //! short-circuiting the empty case!
use std::assert::assert_matches; use std::assert_matches::assert_matches;
use std::borrow::Cow; use std::borrow::Cow;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};

2
library/core/src/lib.rs
View file

@ -184,7 +184,7 @@ mod macros;
#[cfg(not(test))] #[cfg(not(test))]
#[unstable(feature = "assert_matches", issue = "82775")] #[unstable(feature = "assert_matches", issue = "82775")]
/// Unstable module containing the unstable `assert_matches` macro. /// Unstable module containing the unstable `assert_matches` macro.
pub mod assert { pub mod assert_matches {
#[unstable(feature = "assert_matches", issue = "82775")] #[unstable(feature = "assert_matches", issue = "82775")]
pub use crate::macros::{assert_matches, debug_assert_matches}; pub use crate::macros::{assert_matches, debug_assert_matches};
} }

6
library/core/src/macros/mod.rs
View file

@ -127,7 +127,7 @@ macro_rules! assert_ne {
/// ``` /// ```
/// #![feature(assert_matches)] /// #![feature(assert_matches)]
/// ///
/// use std::assert::assert_matches; /// use std::assert_matches::assert_matches;
/// ///
/// let a = 1u32.checked_add(2); /// let a = 1u32.checked_add(2);
/// let b = 1u32.checked_sub(2); /// let b = 1u32.checked_sub(2);
@ -286,7 +286,7 @@ macro_rules! debug_assert_ne {
/// ``` /// ```
/// #![feature(assert_matches)] /// #![feature(assert_matches)]
/// ///
/// use std::assert::debug_assert_matches; /// use std::assert_matches::debug_assert_matches;
/// ///
/// let a = 1u32.checked_add(2); /// let a = 1u32.checked_add(2);
/// let b = 1u32.checked_sub(2); /// let b = 1u32.checked_sub(2);
@ -301,7 +301,7 @@ macro_rules! debug_assert_ne {
#[allow_internal_unstable(assert_matches)] #[allow_internal_unstable(assert_matches)]
#[rustc_macro_transparency = "semitransparent"] #[rustc_macro_transparency = "semitransparent"]
pub macro debug_assert_matches($($arg:tt)*) { pub macro debug_assert_matches($($arg:tt)*) {
if $crate::cfg!(debug_assertions) { $crate::assert::assert_matches!($($arg)*); } if $crate::cfg!(debug_assertions) { $crate::assert_matches::assert_matches!($($arg)*); }
} }
/// Returns whether the given expression matches any of the given patterns. /// Returns whether the given expression matches any of the given patterns.

6
library/std/src/lib.rs
View file

@ -556,9 +556,9 @@ pub use core::{
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")] #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
#[allow(deprecated)] #[allow(deprecated)]
pub use core::{ pub use core::{
asm, assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args, asm, assert, assert_matches, cfg, column, compile_error, concat, concat_idents, env, file,
format_args_nl, global_asm, include, include_bytes, include_str, line, llvm_asm, log_syntax, format_args, format_args_nl, global_asm, include, include_bytes, include_str, line, llvm_asm,
module_path, option_env, stringify, trace_macros, log_syntax, module_path, option_env, stringify, trace_macros,
}; };
#[stable(feature = "core_primitive", since = "1.43.0")] #[stable(feature = "core_primitive", since = "1.43.0")]

2
src/test/ui/macros/assert-matches-macro-msg.rs
View file

@ -6,7 +6,7 @@
#![feature(assert_matches)] #![feature(assert_matches)]
use std::assert::assert_matches; use std::assert_matches::assert_matches;
fn main() { fn main() {
assert_matches!(1 + 1, 3, "1 + 1 definitely should be 3"); assert_matches!(1 + 1, 3, "1 + 1 definitely should be 3");

2
src/test/ui/matches2021.rs
View file

@ -6,7 +6,7 @@
#![feature(assert_matches)] #![feature(assert_matches)]
use std::assert::assert_matches; use std::assert_matches::assert_matches;
fn main() { fn main() {
assert!(matches!((), ())); assert!(matches!((), ()));