nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename assert_matches module

Browse Source
This commit is contained in:
Jane Lusby 2021-07-16 09:18:14 -07:00
parent 59d92bd017
commit 93b7aee2da
4 changed files with 6 additions and 6 deletions
Show Stats 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/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")]