about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-07-17 00:35:36 +0000
committerbors <bors@rust-lang.org>2021-07-17 00:35:36 +0000
commit0cd12d649ea966648cc2c7c5dec8f4933d6fa355 (patch)
tree68bb9338b27a6526d069329fa0377a85b3cc5342 /src/test
parent32c447e179cb4c3ae34e51b2f37b4390953ff55c (diff)
parentd0e8de68c4c59fd1e0fb4ba1e3ab4c7bbff842a0 (diff)
downloadrust-0cd12d649ea966648cc2c7c5dec8f4933d6fa355.tar.gz
rust-0cd12d649ea966648cc2c7c5dec8f4933d6fa355.zip
Auto merge of #87195 - yaahc:move-assert_matches-again, r=oli-obk
rename assert_matches module

Fixes nightly breakage introduced in https://github.com/rust-lang/rust/pull/86947
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/macros/assert-matches-macro-msg.rs2
-rw-r--r--src/test/ui/matches2021.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/macros/assert-matches-macro-msg.rs b/src/test/ui/macros/assert-matches-macro-msg.rs
index 714a6561a6d..fd8cd5a1a05 100644
--- a/src/test/ui/macros/assert-matches-macro-msg.rs
+++ b/src/test/ui/macros/assert-matches-macro-msg.rs
@@ -6,7 +6,7 @@
 
 #![feature(assert_matches)]
 
-use std::assert::assert_matches;
+use std::assert_matches::assert_matches;
 
 fn main() {
     assert_matches!(1 + 1, 3, "1 + 1 definitely should be 3");
diff --git a/src/test/ui/matches2021.rs b/src/test/ui/matches2021.rs
index a6fa5128d2f..f5497c1d16d 100644
--- a/src/test/ui/matches2021.rs
+++ b/src/test/ui/matches2021.rs
@@ -6,7 +6,7 @@
 
 #![feature(assert_matches)]
 
-use std::assert::assert_matches;
+use std::assert_matches::assert_matches;
 
 fn main() {
     assert!(matches!((), ()));