Change all run-pass hygiene tests to ui tests

Change some tests to `check-pass` that are only testing name resolution.
rust-lang · Jul 16, 2019 · 03178f3 · 03178f3
1 parent 96234d5
commit 03178f3
Show file tree

Hide file tree

Showing 26 changed files with 14 additions and 21 deletions.
diff --git a/...s/hygiene/auxiliary/legacy_interaction.rs → ...i/hygiene/auxiliary/legacy_interaction.rs b/...s/hygiene/auxiliary/legacy_interaction.rs → ...i/hygiene/auxiliary/legacy_interaction.rs
@@ -1,4 +1,3 @@
-// run-pass
 // ignore-pretty pretty-printing is unhygienic
 
 #[macro_export]

diff --git a/...st/run-pass/hygiene/auxiliary/my_crate.rs → src/test/ui/hygiene/auxiliary/my_crate.rs b/...st/run-pass/hygiene/auxiliary/my_crate.rs → src/test/ui/hygiene/auxiliary/my_crate.rs
@@ -1,2 +1 @@
-// run-pass
 pub fn f() {}
diff --git a/...s/hygiene/auxiliary/unhygienic_example.rs → ...i/hygiene/auxiliary/unhygienic_example.rs b/...s/hygiene/auxiliary/unhygienic_example.rs → ...i/hygiene/auxiliary/unhygienic_example.rs
@@ -1,4 +1,3 @@
-// run-pass
 #![crate_type = "lib"]
 
 extern crate my_crate;

diff --git a/...test/run-pass/hygiene/auxiliary/xcrate.rs → src/test/ui/hygiene/auxiliary/xcrate.rs b/...test/run-pass/hygiene/auxiliary/xcrate.rs → 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/...est/run-pass/hygiene/hygiene-dodging-1.rs → src/test/ui/hygiene/hygiene-dodging-1.rs b/...est/run-pass/hygiene/hygiene-dodging-1.rs → src/test/ui/hygiene/hygiene-dodging-1.rs
diff --git a/src/test/run-pass/hygiene/hygiene.rs → src/test/ui/hygiene/hygiene.rs b/src/test/run-pass/hygiene/hygiene.rs → src/test/ui/hygiene/hygiene.rs
diff --git a/...un-pass/hygiene/hygienic-labels-in-let.rs → ...test/ui/hygiene/hygienic-labels-in-let.rs b/...un-pass/hygiene/hygienic-labels-in-let.rs → ...test/ui/hygiene/hygienic-labels-in-let.rs
diff --git a/...ass/hygiene/hygienic-labels-in-let.stderr → .../ui/hygiene/hygienic-labels-in-let.stderr b/...ass/hygiene/hygienic-labels-in-let.stderr → .../ui/hygiene/hygienic-labels-in-let.stderr
diff --git a/src/test/run-pass/hygiene/hygienic-labels.rs → src/test/ui/hygiene/hygienic-labels.rs b/src/test/run-pass/hygiene/hygienic-labels.rs → src/test/ui/hygiene/hygienic-labels.rs
diff --git a/...t/run-pass/hygiene/hygienic-labels.stderr → src/test/ui/hygiene/hygienic-labels.stderr b/...t/run-pass/hygiene/hygienic-labels.stderr → src/test/ui/hygiene/hygienic-labels.stderr
diff --git a/src/test/run-pass/hygiene/issue-44128.rs → src/test/ui/hygiene/issue-44128.rs b/src/test/run-pass/hygiene/issue-44128.rs → 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 → src/test/ui/hygiene/issue-47311.rs b/src/test/run-pass/hygiene/issue-47311.rs → 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 → src/test/ui/hygiene/issue-47312.rs b/src/test/run-pass/hygiene/issue-47312.rs → 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 → src/test/ui/hygiene/items.rs b/src/test/run-pass/hygiene/items.rs → 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/...st/run-pass/hygiene/legacy_interaction.rs → src/test/ui/hygiene/legacy_interaction.rs b/...st/run-pass/hygiene/legacy_interaction.rs → 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 → src/test/ui/hygiene/lexical.rs b/src/test/run-pass/hygiene/lexical.rs → 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/run-pass/hygiene/specialization.rs → src/test/ui/hygiene/specialization.rs b/src/test/run-pass/hygiene/specialization.rs → src/test/ui/hygiene/specialization.rs
diff --git a/src/test/run-pass/hygiene/trait_items.rs → src/test/ui/hygiene/trait_items-2.rs b/src/test/run-pass/hygiene/trait_items.rs → 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/run-pass/hygiene/ty_params.rs → src/test/ui/hygiene/ty_params.rs b/src/test/run-pass/hygiene/ty_params.rs → 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/...n-pass/hygiene/wrap_unhygienic_example.rs → ...est/ui/hygiene/wrap_unhygienic_example.rs b/...n-pass/hygiene/wrap_unhygienic_example.rs → ...est/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 → src/test/ui/hygiene/xcrate.rs b/src/test/run-pass/hygiene/xcrate.rs → src/test/ui/hygiene/xcrate.rs