From adacd90f29c381c2e3876f356dda7575a96ffef5 Mon Sep 17 00:00:00 2001
From: cyrgani <ansgar.w.zielke@gmail.com>
Date: Thu, 19 Mar 2026 14:37:13 +0000
Subject: [PATCH 1/2] move many `ui/macros` tests from `run-` to `check-pass`

---
 tests/ui/macros/issue-2804.rs                                   | 2 +-
 tests/ui/macros/issue-33185.rs                                  | 2 +-
 tests/ui/macros/issue-40469.rs                                  | 2 +-
 tests/ui/macros/issue-40770.rs                                  | 2 +-
 tests/ui/macros/macro-attribute-expansion.rs                    | 2 +-
 tests/ui/macros/macro-attributes.rs                             | 2 +-
 tests/ui/macros/macro-delimiter-significance.rs                 | 2 +-
 tests/ui/macros/macro-doc-comments.rs                           | 2 +-
 tests/ui/macros/macro-doc-escapes.rs                            | 2 +-
 tests/ui/macros/macro-follow-rpass.rs                           | 2 +-
 tests/ui/macros/macro-followed-by-seq.rs                        | 2 +-
 tests/ui/macros/macro-in-fn.rs                                  | 2 +-
 .../macros/macro-invocation-in-count-expr-fixed-array-type.rs   | 2 +-
 tests/ui/macros/macro-multiple-items.rs                         | 2 +-
 tests/ui/macros/macro-named-default.rs                          | 2 +-
 tests/ui/macros/macro-nt-list.rs                                | 2 +-
 tests/ui/macros/macro-pat-follow-2018.rs                        | 2 +-
 tests/ui/macros/macro-pub-matcher.rs                            | 2 +-
 tests/ui/macros/macro-seq-followed-by-seq.rs                    | 2 +-
 tests/ui/macros/macro-use-all-and-none.rs                       | 2 +-
 tests/ui/macros/macro-use-all.rs                                | 2 +-
 tests/ui/macros/macro-use-both.rs                               | 2 +-
 tests/ui/macros/macro-use-one.rs                                | 2 +-
 tests/ui/macros/parse-complex-macro-invoc-op.rs                 | 2 +-
 tests/ui/macros/pub-item-inside-macro.rs                        | 2 +-
 tests/ui/macros/pub-method-inside-macro.rs                      | 2 +-
 tests/ui/macros/semi-after-macro-ty.rs                          | 2 +-
 tests/ui/macros/two-macro-use.rs                                | 2 +-
 tests/ui/macros/type-macros-simple.rs                           | 2 +-
 tests/ui/macros/use-macro-self.rs                               | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/ui/macros/issue-2804.rs b/tests/ui/macros/issue-2804.rs
index 0b6f9487ece2..9f45df4a3178 100644
--- a/tests/ui/macros/issue-2804.rs
+++ b/tests/ui/macros/issue-2804.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
diff --git a/tests/ui/macros/issue-33185.rs b/tests/ui/macros/issue-33185.rs
index 8d7e305f1e35..5771b40809dc 100644
--- a/tests/ui/macros/issue-33185.rs
+++ b/tests/ui/macros/issue-33185.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(dead_code)]
 
 #[macro_export]
diff --git a/tests/ui/macros/issue-40469.rs b/tests/ui/macros/issue-40469.rs
index faa4c6581af7..4529e44e267d 100644
--- a/tests/ui/macros/issue-40469.rs
+++ b/tests/ui/macros/issue-40469.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/macros/issue-40770.rs b/tests/ui/macros/issue-40770.rs
index d90294acd251..028bd48b1be7 100644
--- a/tests/ui/macros/issue-40770.rs
+++ b/tests/ui/macros/issue-40770.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(unused_macros)]
 macro_rules! m {
     ($e:expr) => {
diff --git a/tests/ui/macros/macro-attribute-expansion.rs b/tests/ui/macros/macro-attribute-expansion.rs
index be682b38865d..255400e2679e 100644
--- a/tests/ui/macros/macro-attribute-expansion.rs
+++ b/tests/ui/macros/macro-attribute-expansion.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! descriptions {
     ($name:ident is $desc:expr) => {
         // Check that we will correctly expand attributes
diff --git a/tests/ui/macros/macro-attributes.rs b/tests/ui/macros/macro-attributes.rs
index 976d2cbcccdb..a25ed2ba7ef6 100644
--- a/tests/ui/macros/macro-attributes.rs
+++ b/tests/ui/macros/macro-attributes.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 macro_rules! compiles_fine {
     (#[$at:meta]) => {
diff --git a/tests/ui/macros/macro-delimiter-significance.rs b/tests/ui/macros/macro-delimiter-significance.rs
index 8b532e19196b..1947ecf9b22e 100644
--- a/tests/ui/macros/macro-delimiter-significance.rs
+++ b/tests/ui/macros/macro-delimiter-significance.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 fn main() {
     vec![1_usize, 2, 3].len();
 }
diff --git a/tests/ui/macros/macro-doc-comments.rs b/tests/ui/macros/macro-doc-comments.rs
index 47740e26fb6f..4622c3710e93 100644
--- a/tests/ui/macros/macro-doc-comments.rs
+++ b/tests/ui/macros/macro-doc-comments.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(non_snake_case)]
 
 macro_rules! doc {
diff --git a/tests/ui/macros/macro-doc-escapes.rs b/tests/ui/macros/macro-doc-escapes.rs
index 81c8d3383b57..77d9a5c048fa 100644
--- a/tests/ui/macros/macro-doc-escapes.rs
+++ b/tests/ui/macros/macro-doc-escapes.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 // When expanding a macro, documentation attributes (including documentation comments) must be
 // passed "as is" without being parsed. Otherwise, some text will be incorrectly interpreted as
 // escape sequences, leading to an ICE.
diff --git a/tests/ui/macros/macro-follow-rpass.rs b/tests/ui/macros/macro-follow-rpass.rs
index 8551b1887708..dfaacefc528a 100644
--- a/tests/ui/macros/macro-follow-rpass.rs
+++ b/tests/ui/macros/macro-follow-rpass.rs
@@ -1,5 +1,5 @@
 //@ edition:2015..2021
-//@ run-pass
+//@ check-pass
 #![allow(unused_macros)]
 // Check the macro follow sets (see corresponding cfail test).
 
diff --git a/tests/ui/macros/macro-followed-by-seq.rs b/tests/ui/macros/macro-followed-by-seq.rs
index f4756d42088a..3643836fa031 100644
--- a/tests/ui/macros/macro-followed-by-seq.rs
+++ b/tests/ui/macros/macro-followed-by-seq.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(unused_macros)]
 // Regression test for issue #25436: check that things which can be
 // followed by any token also permit X* to come afterwards.
diff --git a/tests/ui/macros/macro-in-fn.rs b/tests/ui/macros/macro-in-fn.rs
index 2ffa6b2e4572..48085b8b221b 100644
--- a/tests/ui/macros/macro-in-fn.rs
+++ b/tests/ui/macros/macro-in-fn.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![feature(decl_macro)]
 
 pub fn moo() {
diff --git a/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs b/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
index e80c712b03dc..ed8974c23e71 100644
--- a/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
+++ b/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 macro_rules! four {
     () => (4)
diff --git a/tests/ui/macros/macro-multiple-items.rs b/tests/ui/macros/macro-multiple-items.rs
index c746d1bc5188..46b561af4467 100644
--- a/tests/ui/macros/macro-multiple-items.rs
+++ b/tests/ui/macros/macro-multiple-items.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! make_foo {
     () => (
         struct Foo;
diff --git a/tests/ui/macros/macro-named-default.rs b/tests/ui/macros/macro-named-default.rs
index bca0e005083d..c7eac831cffb 100644
--- a/tests/ui/macros/macro-named-default.rs
+++ b/tests/ui/macros/macro-named-default.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! default {
     ($($x:tt)*) => { $($x)* }
 }
diff --git a/tests/ui/macros/macro-nt-list.rs b/tests/ui/macros/macro-nt-list.rs
index b7b260c5398c..56ea917c3be9 100644
--- a/tests/ui/macros/macro-nt-list.rs
+++ b/tests/ui/macros/macro-nt-list.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 macro_rules! list {
     ( ($($id:ident),*) ) => (());
diff --git a/tests/ui/macros/macro-pat-follow-2018.rs b/tests/ui/macros/macro-pat-follow-2018.rs
index 6dcb841fec15..b2a556fce6f9 100644
--- a/tests/ui/macros/macro-pat-follow-2018.rs
+++ b/tests/ui/macros/macro-pat-follow-2018.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ edition:2018
 
 macro_rules! pat_bar {
diff --git a/tests/ui/macros/macro-pub-matcher.rs b/tests/ui/macros/macro-pub-matcher.rs
index e0b03dbbeb1b..20cacab390d5 100644
--- a/tests/ui/macros/macro-pub-matcher.rs
+++ b/tests/ui/macros/macro-pub-matcher.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(dead_code, unused_imports, unused_macro_rules)]
 
 /**
diff --git a/tests/ui/macros/macro-seq-followed-by-seq.rs b/tests/ui/macros/macro-seq-followed-by-seq.rs
index 3661744284ee..cf5a1c117031 100644
--- a/tests/ui/macros/macro-seq-followed-by-seq.rs
+++ b/tests/ui/macros/macro-seq-followed-by-seq.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 // Test of allowing two sequences repetitions in a row,
 // functionality added as byproduct of RFC amendment #1384
 //   https://github.com/rust-lang/rfcs/pull/1384
diff --git a/tests/ui/macros/macro-use-all-and-none.rs b/tests/ui/macros/macro-use-all-and-none.rs
index f1acff484038..53d450ed8d58 100644
--- a/tests/ui/macros/macro-use-all-and-none.rs
+++ b/tests/ui/macros/macro-use-all-and-none.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros-rpass.rs
 
 #![warn(unused_attributes)]
diff --git a/tests/ui/macros/macro-use-all.rs b/tests/ui/macros/macro-use-all.rs
index a7fd3dfa5ce6..06b96da7f8b1 100644
--- a/tests/ui/macros/macro-use-all.rs
+++ b/tests/ui/macros/macro-use-all.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use]
diff --git a/tests/ui/macros/macro-use-both.rs b/tests/ui/macros/macro-use-both.rs
index e49f346c8e3e..c41797513f6a 100644
--- a/tests/ui/macros/macro-use-both.rs
+++ b/tests/ui/macros/macro-use-both.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use(macro_one, macro_two)]
diff --git a/tests/ui/macros/macro-use-one.rs b/tests/ui/macros/macro-use-one.rs
index 2b048651cccc..93f7c212e001 100644
--- a/tests/ui/macros/macro-use-one.rs
+++ b/tests/ui/macros/macro-use-one.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use(macro_two)]
diff --git a/tests/ui/macros/parse-complex-macro-invoc-op.rs b/tests/ui/macros/parse-complex-macro-invoc-op.rs
index 2c384bdb42ef..bbb01facc624 100644
--- a/tests/ui/macros/parse-complex-macro-invoc-op.rs
+++ b/tests/ui/macros/parse-complex-macro-invoc-op.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_assignments)]
diff --git a/tests/ui/macros/pub-item-inside-macro.rs b/tests/ui/macros/pub-item-inside-macro.rs
index c37945a2d672..679987ac1f4a 100644
--- a/tests/ui/macros/pub-item-inside-macro.rs
+++ b/tests/ui/macros/pub-item-inside-macro.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 // Issue #14660
 
 
diff --git a/tests/ui/macros/pub-method-inside-macro.rs b/tests/ui/macros/pub-method-inside-macro.rs
index dd4e6fda8be9..23d8c454d697 100644
--- a/tests/ui/macros/pub-method-inside-macro.rs
+++ b/tests/ui/macros/pub-method-inside-macro.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 // Issue #17436
 
 
diff --git a/tests/ui/macros/semi-after-macro-ty.rs b/tests/ui/macros/semi-after-macro-ty.rs
index 60afc3b44506..ff026c53b1d7 100644
--- a/tests/ui/macros/semi-after-macro-ty.rs
+++ b/tests/ui/macros/semi-after-macro-ty.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! foo {
     ($t:ty; $p:path;) => {}
 }
diff --git a/tests/ui/macros/two-macro-use.rs b/tests/ui/macros/two-macro-use.rs
index 8bb3c9da3051..733853f8d234 100644
--- a/tests/ui/macros/two-macro-use.rs
+++ b/tests/ui/macros/two-macro-use.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use(macro_one)]
diff --git a/tests/ui/macros/type-macros-simple.rs b/tests/ui/macros/type-macros-simple.rs
index d189b881f7dd..800a796491be 100644
--- a/tests/ui/macros/type-macros-simple.rs
+++ b/tests/ui/macros/type-macros-simple.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
 #![allow(non_local_definitions)]
diff --git a/tests/ui/macros/use-macro-self.rs b/tests/ui/macros/use-macro-self.rs
index 1d15b8386af9..cf5a410c6edf 100644
--- a/tests/ui/macros/use-macro-self.rs
+++ b/tests/ui/macros/use-macro-self.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(unused_imports)]
 //@ aux-build:use-macro-self.rs
 

From 9ce6863063006951d678d0ec8a9e037731478609 Mon Sep 17 00:00:00 2001
From: cyrgani <ansgar.w.zielke@gmail.com>
Date: Thu, 19 Mar 2026 14:40:33 +0000
Subject: [PATCH 2/2] merge `die-macro` tests into `panic-macro-basic.rs`

---
 tests/ui/macros/die-macro-2.rs                   |  7 -------
 tests/ui/macros/die-macro-pure.rs                | 11 -----------
 tests/ui/macros/die-macro.rs                     | 16 ----------------
 .../{die-macro-expr.rs => panic-macro-basic.rs}  |  9 ++++++++-
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 tests/ui/macros/die-macro-2.rs
 delete mode 100644 tests/ui/macros/die-macro-pure.rs
 delete mode 100644 tests/ui/macros/die-macro.rs
 rename tests/ui/macros/{die-macro-expr.rs => panic-macro-basic.rs} (53%)

diff --git a/tests/ui/macros/die-macro-2.rs b/tests/ui/macros/die-macro-2.rs
deleted file mode 100644
index d802f189ce1a..000000000000
--- a/tests/ui/macros/die-macro-2.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//@ run-fail
-//@ error-pattern:test
-//@ needs-subprocess
-
-fn main() {
-    panic!("test");
-}
diff --git a/tests/ui/macros/die-macro-pure.rs b/tests/ui/macros/die-macro-pure.rs
deleted file mode 100644
index d84787705a1a..000000000000
--- a/tests/ui/macros/die-macro-pure.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//@ run-fail
-//@ error-pattern:test
-//@ needs-subprocess
-
-fn f() {
-    panic!("test");
-}
-
-fn main() {
-    f();
-}
diff --git a/tests/ui/macros/die-macro.rs b/tests/ui/macros/die-macro.rs
deleted file mode 100644
index b717eed3fb43..000000000000
--- a/tests/ui/macros/die-macro.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-// Just testing that panic!() type checks in statement or expr
-
-
-#![allow(unreachable_code)]
-
-fn f() {
-    panic!();
-
-    let _x: isize = panic!();
-}
-
-pub fn main() {
-
-}
diff --git a/tests/ui/macros/die-macro-expr.rs b/tests/ui/macros/panic-macro-basic.rs
similarity index 53%
rename from tests/ui/macros/die-macro-expr.rs
rename to tests/ui/macros/panic-macro-basic.rs
index f4fefb0ca37d..96ed4265ef6e 100644
--- a/tests/ui/macros/die-macro-expr.rs
+++ b/tests/ui/macros/panic-macro-basic.rs
@@ -1,7 +1,14 @@
 //@ run-fail
 //@ error-pattern:test
 //@ needs-subprocess
+// Just testing that panic!() type checks in statement or expr
+
+fn f() {
+    let __isize: isize = panic!("test");
+
+    panic!();
+}
 
 fn main() {
-    let __isize: isize = panic!("test");
+    f();
 }