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

Mark-Simulacrum · web-flow · commit aa31ca71283f · 2019-07-18T11:29:43.000-04:00
Consolidate hygiene tests

Some general clean-up extracted out from another PR
diff --git a/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile b/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
diff --git a/src/test/ui/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/ui/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/ui/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/ui/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
@@ -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
@@ -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
@@ -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/ui/hygiene/hygiene-dodging-1.rs b/src/test/ui/hygiene/hygiene-dodging-1.rs
diff --git a/src/test/ui/hygiene/hygiene.rs b/src/test/ui/hygiene/hygiene.rs
diff --git a/src/test/ui/hygiene/hygienic-labels-in-let.rs b/src/test/ui/hygiene/hygienic-labels-in-let.rs
diff --git a/src/test/ui/hygiene/hygienic-labels-in-let.stderr b/src/test/ui/hygiene/hygienic-labels-in-let.stderr
diff --git a/src/test/ui/hygiene/hygienic-labels.rs b/src/test/ui/hygiene/hygienic-labels.rs
diff --git a/src/test/ui/hygiene/hygienic-labels.stderr b/src/test/ui/hygiene/hygienic-labels.stderr
diff --git a/src/test/ui/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/ui/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/ui/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/ui/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/ui/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/ui/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
@@ -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/ui/hygiene/specialization.rs b/src/test/ui/hygiene/specialization.rs
diff --git a/src/test/ui/hygiene/trait_items-2.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
@@ -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/ui/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/ui/hygiene/unpretty-debug.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/ui/hygiene/unpretty-debug.stdout 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/ui/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/ui/hygiene/xcrate.rs b/src/test/ui/hygiene/xcrate.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// run-pass`
`2`	`1`	`// ignore-pretty pretty-printing is unhygienic`
`3`	`2`
`4`	`3`	`#[macro_export]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// run-pass`
`2`	`1`	`#![crate_type = "lib"]`
`3`	`2`
`4`	`3`	`extern crate my_crate;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// run-pass`
`2`	`1`	`#![feature(decl_macro)]`
`3`	`2`	`#![allow(unused)]`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: format argument must be a string literal`
`2`		`- --> $DIR/expansion-info-reset.rs:5:18`
	`2`	`+ --> $DIR/expansion-info-reset.rs:2:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| format_args!({ #[derive(Clone)] struct S; });`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`