Identify subpatterns by the path to them instead of spans

2 files changed, 3 insertions, 21 deletions

diff --git a/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs b/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs
index 483edcebd62..aac7d7d5385 100644
--- a/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs
+++ b/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.rs
@@ -1,5 +1,5 @@
+// check-pass
 #![deny(unreachable_patterns)]
-//~^ NOTE: lint level is defined here
 pub enum TypeCtor {
     Slice,
     Array,
@@ -9,13 +9,13 @@ pub struct ApplicationTy(TypeCtor);
 
 macro_rules! ty_app {
     ($ctor:pat) => {
-        ApplicationTy($ctor) //~ ERROR unreachable pattern
+        ApplicationTy($ctor)
     };
 }
 
 fn _foo(ty: ApplicationTy) {
     match ty {
-        ty_app!(TypeCtor::Array) | ty_app!(TypeCtor::Slice) => {} //~ NOTE: in this expansion
+        ty_app!(TypeCtor::Array) | ty_app!(TypeCtor::Slice) => {}
     }
 
     // same as above, with the macro expanded
diff --git a/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.stderr b/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.stderr
deleted file mode 100644
index 9d12b4a20e9..00000000000
--- a/src/test/ui/pattern/usefulness/issue-80501-or-pat-and-macro.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: unreachable pattern
-  --> $DIR/issue-80501-or-pat-and-macro.rs:12:9
-   |
-LL |         ApplicationTy($ctor)
-   |         ^^^^^^^^^^^^^^^^^^^^
-...
-LL |         ty_app!(TypeCtor::Array) | ty_app!(TypeCtor::Slice) => {}
-   |                                    ------------------------ in this macro invocation
-   |
-note: the lint level is defined here
-  --> $DIR/issue-80501-or-pat-and-macro.rs:1:9
-   |
-LL | #![deny(unreachable_patterns)]
-   |         ^^^^^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to previous error
-