Rollup merge of #154112 - cyrgani:macros-folder, r=Kivooeo

some `tests/ui/macros` cleanup

Move most tests that do not run any code from `//@ run-pass` to `//@ check-pass` and merge the (outdated) `die-macro-*` tests into one file.

tests/ui/macros/die-macro-2.rs

@@ -1,7 +0,0 @@
-//@ run-fail
-//@ error-pattern:test
-//@ needs-subprocess
-
-fn main() {
-    panic!("test");
-}

tests/ui/macros/die-macro-pure.rs

@@ -1,11 +0,0 @@
-//@ run-fail
-//@ error-pattern:test
-//@ needs-subprocess
-
-fn f() {
-    panic!("test");
-}
-
-fn main() {
-    f();
-}

tests/ui/macros/die-macro.rs

@@ -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() {
-
-}

tests/ui/macros/issue-2804.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]

tests/ui/macros/issue-33185.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(dead_code)]
 
 #[macro_export]

tests/ui/macros/issue-40469.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 #![allow(dead_code)]
 

tests/ui/macros/issue-40770.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(unused_macros)]
 macro_rules! m {
     ($e:expr) => {

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

tests/ui/macros/macro-attributes.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 macro_rules! compiles_fine {
     (#[$at:meta]) => {

tests/ui/macros/macro-delimiter-significance.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 fn main() {
     vec![1_usize, 2, 3].len();
 }

tests/ui/macros/macro-doc-comments.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(non_snake_case)]
 
 macro_rules! doc {

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.

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).
 

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.

tests/ui/macros/macro-in-fn.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![feature(decl_macro)]
 
 pub fn moo() {

tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 macro_rules! four {
     () => (4)

tests/ui/macros/macro-multiple-items.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! make_foo {
     () => (
         struct Foo;

tests/ui/macros/macro-named-default.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! default {
     ($($x:tt)*) => { $($x)* }
 }

tests/ui/macros/macro-nt-list.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 macro_rules! list {
     ( ($($id:ident),*) ) => (());

tests/ui/macros/macro-pat-follow-2018.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ edition:2018
 
 macro_rules! pat_bar {

tests/ui/macros/macro-pub-matcher.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(dead_code, unused_imports, unused_macro_rules)]
 
 /**

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

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)]

tests/ui/macros/macro-use-all.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use]

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)]

tests/ui/macros/macro-use-one.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use(macro_two)]

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();
 }

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)]

tests/ui/macros/pub-item-inside-macro.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 // Issue #14660
 
 

tests/ui/macros/pub-method-inside-macro.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 // Issue #17436
 
 

tests/ui/macros/semi-after-macro-ty.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 macro_rules! foo {
     ($t:ty; $p:path;) => {}
 }

tests/ui/macros/two-macro-use.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 //@ aux-build:two_macros.rs
 
 #[macro_use(macro_one)]

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)]

tests/ui/macros/use-macro-self.rs

@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 #![allow(unused_imports)]
 //@ aux-build:use-macro-self.rs