Rollup merge of #62730 - matthewjasper:hygiene-tests, r=petrochenkov

Consolidate hygiene tests

Some general clean-up extracted out from another PR

29 files changed, 26 insertions, 42 deletions

diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile b/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
deleted file mode 100644
index 136d7643ade..00000000000
--- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
--include ../tools.mk
-
-REPLACEMENT := s/[0-9][0-9]*\#[0-9][0-9]*/$(shell date)/g
-
-all:
-	$(RUSTC) -o $(TMPDIR)/input.out -Z unstable-options \
-		--pretty expanded,hygiene input.rs
-
-	# the name/ctxt numbers are very internals-dependent and thus
-	# change relatively frequently, and testing for their exact values
-	# them will fail annoyingly, so we just check their positions
-	# (using a non-constant replacement like this will make it less
-	# likely the compiler matches whatever other dummy value we
-	# choose).
-	#
-	# (These need to be out-of-place because OSX/BSD & GNU sed
-	# differ.)
-	sed "$(REPLACEMENT)" input.pp.rs > $(TMPDIR)/input.pp.rs
-	sed "$(REPLACEMENT)" $(TMPDIR)/input.out > $(TMPDIR)/input.out.replaced
-
-	diff -u $(TMPDIR)/input.out.replaced $(TMPDIR)/input.pp.rs
diff --git a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs b/src/test/ui/hygiene/auxiliary/legacy_interaction.rs
index 0774fbecac1..90d5243b74b 100644
--- a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs
+++ b/src/test/ui/hygiene/auxiliary/legacy_interaction.rs
@@ -1,4 +1,3 @@
-// run-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #[macro_export]
diff --git a/src/test/run-pass/hygiene/auxiliary/my_crate.rs b/src/test/ui/hygiene/auxiliary/my_crate.rs
index 5a7412e4bf5..cdc6c27d800 100644
--- a/src/test/run-pass/hygiene/auxiliary/my_crate.rs
+++ b/src/test/ui/hygiene/auxiliary/my_crate.rs
@@ -1,2 +1 @@
-// run-pass
 pub fn f() {}
diff --git a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs b/src/test/ui/hygiene/auxiliary/unhygienic_example.rs
index 3f66748bf30..8e6e8f9b32f 100644
--- a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs
+++ b/src/test/ui/hygiene/auxiliary/unhygienic_example.rs
@@ -1,4 +1,3 @@
-// run-pass
 #![crate_type = "lib"]
 
 extern crate my_crate;
diff --git a/src/test/run-pass/hygiene/auxiliary/xcrate.rs b/src/test/ui/hygiene/auxiliary/xcrate.rs
index 3862914d584..f5a911f57df 100644
--- a/src/test/run-pass/hygiene/auxiliary/xcrate.rs
+++ b/src/test/ui/hygiene/auxiliary/xcrate.rs
@@ -1,4 +1,3 @@
-// run-pass
 #![feature(decl_macro)]
 #![allow(unused)]
 
diff --git a/src/test/ui/hygiene/dollar-crate-modern.rs b/src/test/ui/hygiene/dollar-crate-modern.rs
index 9c25e138d2c..a432fb6eee1 100644
--- a/src/test/ui/hygiene/dollar-crate-modern.rs
+++ b/src/test/ui/hygiene/dollar-crate-modern.rs
@@ -1,6 +1,6 @@
 // Make sure `$crate` and `crate` work in for basic cases of nested macros.
 
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
 // aux-build:intercrate.rs
 
 #![feature(decl_macro, crate_in_paths)]
diff --git a/src/test/ui/hygiene/expansion-info-reset.rs b/src/test/ui/hygiene/expansion-info-reset.rs
index 5c384c4ada9..fa5f712121d 100644
--- a/src/test/ui/hygiene/expansion-info-reset.rs
+++ b/src/test/ui/hygiene/expansion-info-reset.rs
@@ -1,6 +1,3 @@
-// FIXME: Investigate why expansion info for a single expansion id is reset from
-// `MacroBang(format_args)` to `MacroAttribute(derive(Clone))` (issue #52363).
-
 fn main() {
     format_args!({ #[derive(Clone)] struct S; });
     //~^ ERROR format argument must be a string literal
diff --git a/src/test/ui/hygiene/expansion-info-reset.stderr b/src/test/ui/hygiene/expansion-info-reset.stderr
index 9dd954b16cd..d8b602ce1c6 100644
--- a/src/test/ui/hygiene/expansion-info-reset.stderr
+++ b/src/test/ui/hygiene/expansion-info-reset.stderr
@@ -1,5 +1,5 @@
 error: format argument must be a string literal
-  --> $DIR/expansion-info-reset.rs:5:18
+  --> $DIR/expansion-info-reset.rs:2:18
    |
 LL |     format_args!({ #[derive(Clone)] struct S; });
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/run-pass/hygiene/hygiene-dodging-1.rs b/src/test/ui/hygiene/hygiene-dodging-1.rs
index 69e47e82ba5..69e47e82ba5 100644
--- a/src/test/run-pass/hygiene/hygiene-dodging-1.rs
+++ b/src/test/ui/hygiene/hygiene-dodging-1.rs
diff --git a/src/test/run-pass/hygiene/hygiene.rs b/src/test/ui/hygiene/hygiene.rs
index fb351cf0faf..fb351cf0faf 100644
--- a/src/test/run-pass/hygiene/hygiene.rs
+++ b/src/test/ui/hygiene/hygiene.rs
diff --git a/src/test/run-pass/hygiene/hygienic-labels-in-let.rs b/src/test/ui/hygiene/hygienic-labels-in-let.rs
index fb9523b547d..fb9523b547d 100644
--- a/src/test/run-pass/hygiene/hygienic-labels-in-let.rs
+++ b/src/test/ui/hygiene/hygienic-labels-in-let.rs
diff --git a/src/test/run-pass/hygiene/hygienic-labels-in-let.stderr b/src/test/ui/hygiene/hygienic-labels-in-let.stderr
index 9c906749f8c..9c906749f8c 100644
--- a/src/test/run-pass/hygiene/hygienic-labels-in-let.stderr
+++ b/src/test/ui/hygiene/hygienic-labels-in-let.stderr
diff --git a/src/test/run-pass/hygiene/hygienic-labels.rs b/src/test/ui/hygiene/hygienic-labels.rs
index a364dd9c887..a364dd9c887 100644
--- a/src/test/run-pass/hygiene/hygienic-labels.rs
+++ b/src/test/ui/hygiene/hygienic-labels.rs
diff --git a/src/test/run-pass/hygiene/hygienic-labels.stderr b/src/test/ui/hygiene/hygienic-labels.stderr
index d88dfce540e..d88dfce540e 100644
--- a/src/test/run-pass/hygiene/hygienic-labels.stderr
+++ b/src/test/ui/hygiene/hygienic-labels.stderr
diff --git a/src/test/run-pass/hygiene/issue-44128.rs b/src/test/ui/hygiene/issue-44128.rs
index 23ced9ae530..5e03bdb8c5b 100644
--- a/src/test/run-pass/hygiene/issue-44128.rs
+++ b/src/test/ui/hygiene/issue-44128.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 #![allow(unused_must_use)]
 #![feature(decl_macro)]
 
diff --git a/src/test/run-pass/hygiene/issue-47311.rs b/src/test/ui/hygiene/issue-47311.rs
index 856184fbc83..5c2379a8aba 100644
--- a/src/test/run-pass/hygiene/issue-47311.rs
+++ b/src/test/ui/hygiene/issue-47311.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]
diff --git a/src/test/run-pass/hygiene/issue-47312.rs b/src/test/ui/hygiene/issue-47312.rs
index 88e7a028f92..bbcb3a7f393 100644
--- a/src/test/run-pass/hygiene/issue-47312.rs
+++ b/src/test/ui/hygiene/issue-47312.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]
diff --git a/src/test/run-pass/hygiene/items.rs b/src/test/ui/hygiene/items.rs
index cdc271386b7..1c625a9728c 100644
--- a/src/test/run-pass/hygiene/items.rs
+++ b/src/test/ui/hygiene/items.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]
diff --git a/src/test/run-pass/hygiene/legacy_interaction.rs b/src/test/ui/hygiene/legacy_interaction.rs
index a5460a89f13..52008eed515 100644
--- a/src/test/run-pass/hygiene/legacy_interaction.rs
+++ b/src/test/ui/hygiene/legacy_interaction.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 #![allow(dead_code)]
 // ignore-pretty pretty-printing is unhygienic
 
@@ -12,7 +12,7 @@ extern crate legacy_interaction;
 // ```rust
 //  macro_rules! m {
 //     () => {
-//         fn f() // (1)
+//         fn f() {} // (1)
 //         g() // (2)
 //     }
 // }
diff --git a/src/test/run-pass/hygiene/lexical.rs b/src/test/ui/hygiene/lexical.rs
index 20bda5508c8..3d25c720989 100644
--- a/src/test/run-pass/hygiene/lexical.rs
+++ b/src/test/ui/hygiene/lexical.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]
diff --git a/src/test/ui/hygiene/local_inner_macros.rs b/src/test/ui/hygiene/local_inner_macros.rs
index f361e3d5d49..71ffcac40d3 100644
--- a/src/test/ui/hygiene/local_inner_macros.rs
+++ b/src/test/ui/hygiene/local_inner_macros.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
 // aux-build:local_inner_macros.rs
 
 extern crate local_inner_macros;
diff --git a/src/test/run-pass/hygiene/specialization.rs b/src/test/ui/hygiene/specialization.rs
index 656aa880ad1..656aa880ad1 100644
--- a/src/test/run-pass/hygiene/specialization.rs
+++ b/src/test/ui/hygiene/specialization.rs
diff --git a/src/test/run-pass/hygiene/trait_items.rs b/src/test/ui/hygiene/trait_items-2.rs
index 680f228c986..39edfc37d69 100644
--- a/src/test/run-pass/hygiene/trait_items.rs
+++ b/src/test/ui/hygiene/trait_items-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]
diff --git a/src/test/ui/hygiene/transparent-basic.rs b/src/test/ui/hygiene/transparent-basic.rs
index 69dfc524989..bfa1713e4ed 100644
--- a/src/test/ui/hygiene/transparent-basic.rs
+++ b/src/test/ui/hygiene/transparent-basic.rs
@@ -1,4 +1,4 @@
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
 // aux-build:transparent-basic.rs
 
 #![feature(decl_macro, rustc_attrs)]
diff --git a/src/test/run-pass/hygiene/ty_params.rs b/src/test/ui/hygiene/ty_params.rs
index dce4bd6489c..b296bfe5988 100644
--- a/src/test/run-pass/hygiene/ty_params.rs
+++ b/src/test/ui/hygiene/ty_params.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]
diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs b/src/test/ui/hygiene/unpretty-debug.rs
index ed3b48dbdc1..6e936bb3d83 100644
--- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
+++ b/src/test/ui/hygiene/unpretty-debug.rs
@@ -1,3 +1,9 @@
+// check-pass
+// compile-flags: -Zunpretty=expanded,hygiene
+
+// Don't break whenever Symbol numbering changes
+// normalize-stdout-test "\d+#" -> "0#"
+
 // minimal junk
 #![feature(no_core)]
 #![no_core]
diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs b/src/test/ui/hygiene/unpretty-debug.stdout
index 570dece023d..beac4c17abf 100644
--- a/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
+++ b/src/test/ui/hygiene/unpretty-debug.stdout
@@ -1,3 +1,9 @@
+// check-pass
+// compile-flags: -Zunpretty=expanded,hygiene
+
+// Don't break whenever Symbol numbering changes
+// normalize-stdout-test "\d+#" -> "0#"
+
 // minimal junk
 #![feature /* 0#0 */(no_core)]
 #![no_core /* 0#0 */]
diff --git a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs b/src/test/ui/hygiene/wrap_unhygienic_example.rs
index e0277e2bb74..50c6b35ab18 100644
--- a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs
+++ b/src/test/ui/hygiene/wrap_unhygienic_example.rs
@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 // aux-build:my_crate.rs
diff --git a/src/test/run-pass/hygiene/xcrate.rs b/src/test/ui/hygiene/xcrate.rs
index 6981ce3f687..6981ce3f687 100644
--- a/src/test/run-pass/hygiene/xcrate.rs
+++ b/src/test/ui/hygiene/xcrate.rs