Use path to refer to constants in cross-crate pattern tests

rust-lang · Apr 28, 2020 · 532ba46 · 532ba46
1 parent e68a5c6
commit 532ba46
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/test/ui/consts/const_in_pattern/cross-crate-fail.rs b/src/test/ui/consts/const_in_pattern/cross-crate-fail.rs
@@ -3,11 +3,10 @@
 #![warn(indirect_structural_match)]
 
 extern crate consts;
-use consts::*;
 
 fn main() {
     match None {
-        SOME => panic!(),
+        consts::SOME => panic!(),
         //~^ must be annotated with `#[derive(PartialEq, Eq)]`
         //~| must be annotated with `#[derive(PartialEq, Eq)]`
 

diff --git a/src/test/ui/consts/const_in_pattern/cross-crate-fail.stderr b/src/test/ui/consts/const_in_pattern/cross-crate-fail.stderr
@@ -1,14 +1,14 @@
 error: to use a constant of type `consts::CustomEq` in a pattern, `consts::CustomEq` must be annotated with `#[derive(PartialEq, Eq)]`
-  --> $DIR/cross-crate-fail.rs:10:9
+  --> $DIR/cross-crate-fail.rs:9:9
    |
-LL |         SOME => panic!(),
-   |         ^^^^
+LL |         consts::SOME => panic!(),
+   |         ^^^^^^^^^^^^
 
 error: to use a constant of type `consts::CustomEq` in a pattern, `consts::CustomEq` must be annotated with `#[derive(PartialEq, Eq)]`
-  --> $DIR/cross-crate-fail.rs:10:9
+  --> $DIR/cross-crate-fail.rs:9:9
    |
-LL |         SOME => panic!(),
-   |         ^^^^
+LL |         consts::SOME => panic!(),
+   |         ^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/const_in_pattern/cross-crate-pass.rs b/src/test/ui/consts/const_in_pattern/cross-crate-pass.rs
@@ -4,11 +4,11 @@
 #![warn(indirect_structural_match)]
 
 extern crate consts;
-use consts::*;
+use consts::CustomEq;
 
 fn main() {
     match Some(CustomEq) {
-        NONE => panic!(),
+        consts::NONE => panic!(),
         _ => {}
     }
 }