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

Consolidate hygiene tests

Some general clean-up extracted out from another PR

src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile

@@ -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

src/test/ui/hygiene/auxiliary/legacy_interaction.rs

@@ -1,4 +1,3 @@
-// run-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #[macro_export]

src/test/ui/hygiene/auxiliary/my_crate.rs

@@ -1,2 +1 @@
-// run-pass
 pub fn f() {}

src/test/ui/hygiene/auxiliary/unhygienic_example.rs

@@ -1,4 +1,3 @@
-// run-pass
 #![crate_type = "lib"]
 
 extern crate my_crate;

src/test/ui/hygiene/auxiliary/xcrate.rs

@@ -1,4 +1,3 @@
-// run-pass
 #![feature(decl_macro)]
 #![allow(unused)]
 

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

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

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

src/test/ui/hygiene/issue-44128.rs

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

src/test/ui/hygiene/issue-47311.rs

@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]

src/test/ui/hygiene/issue-47312.rs

@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]

src/test/ui/hygiene/items.rs

@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]

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)
 //     }
 // }

src/test/ui/hygiene/lexical.rs

@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]

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;

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

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

src/test/ui/hygiene/ty_params.rs

@@ -1,4 +1,4 @@
-// run-pass
+// check-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #![feature(decl_macro)]

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]

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 */]

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