Skip to content

Commit 03178f3

Browse files
committed
Change all run-pass hygiene tests to ui tests
Change some tests to `check-pass` that are only testing name resolution.
1 parent 96234d5 commit 03178f3

26 files changed

+14
-21
lines changed

src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs renamed to src/test/ui/hygiene/auxiliary/legacy_interaction.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// run-pass
21
// ignore-pretty pretty-printing is unhygienic
32

43
#[macro_export]
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
// run-pass
21
pub fn f() {}

src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs renamed to src/test/ui/hygiene/auxiliary/unhygienic_example.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// run-pass
21
#![crate_type = "lib"]
32

43
extern crate my_crate;

src/test/run-pass/hygiene/auxiliary/xcrate.rs renamed to src/test/ui/hygiene/auxiliary/xcrate.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// run-pass
21
#![feature(decl_macro)]
32
#![allow(unused)]
43

src/test/ui/hygiene/dollar-crate-modern.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Make sure `$crate` and `crate` work in for basic cases of nested macros.
22

3-
// build-pass (FIXME(62277): could be check-pass?)
3+
// check-pass
44
// aux-build:intercrate.rs
55

66
#![feature(decl_macro, crate_in_paths)]

src/test/ui/hygiene/expansion-info-reset.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// FIXME: Investigate why expansion info for a single expansion id is reset from
2-
// `MacroBang(format_args)` to `MacroAttribute(derive(Clone))` (issue #52363).
3-
41
fn main() {
52
format_args!({ #[derive(Clone)] struct S; });
63
//~^ ERROR format argument must be a string literal

src/test/ui/hygiene/expansion-info-reset.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: format argument must be a string literal
2-
--> $DIR/expansion-info-reset.rs:5:18
2+
--> $DIR/expansion-info-reset.rs:2:18
33
|
44
LL | format_args!({ #[derive(Clone)] struct S; });
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File renamed without changes.

src/test/run-pass/hygiene/issue-44128.rs renamed to src/test/ui/hygiene/issue-44128.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
#![allow(unused_must_use)]
33
#![feature(decl_macro)]
44

src/test/run-pass/hygiene/issue-47311.rs renamed to src/test/ui/hygiene/issue-47311.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
#![feature(decl_macro)]

src/test/run-pass/hygiene/issue-47312.rs renamed to src/test/ui/hygiene/issue-47312.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
#![feature(decl_macro)]

src/test/run-pass/hygiene/items.rs renamed to src/test/ui/hygiene/items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
#![feature(decl_macro)]

src/test/run-pass/hygiene/legacy_interaction.rs renamed to src/test/ui/hygiene/legacy_interaction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
#![allow(dead_code)]
33
// ignore-pretty pretty-printing is unhygienic
44

@@ -12,7 +12,7 @@ extern crate legacy_interaction;
1212
// ```rust
1313
// macro_rules! m {
1414
// () => {
15-
// fn f() // (1)
15+
// fn f() {} // (1)
1616
// g() // (2)
1717
// }
1818
// }

src/test/run-pass/hygiene/lexical.rs renamed to src/test/ui/hygiene/lexical.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
#![feature(decl_macro)]

src/test/ui/hygiene/local_inner_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// build-pass (FIXME(62277): could be check-pass?)
1+
// check-pass
22
// aux-build:local_inner_macros.rs
33

44
extern crate local_inner_macros;

src/test/run-pass/hygiene/trait_items.rs renamed to src/test/ui/hygiene/trait_items-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
#![feature(decl_macro)]

src/test/ui/hygiene/transparent-basic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// build-pass (FIXME(62277): could be check-pass?)
1+
// check-pass
22
// aux-build:transparent-basic.rs
33

44
#![feature(decl_macro, rustc_attrs)]

src/test/run-pass/hygiene/ty_params.rs renamed to src/test/ui/hygiene/ty_params.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
#![feature(decl_macro)]

src/test/run-pass/hygiene/wrap_unhygienic_example.rs renamed to src/test/ui/hygiene/wrap_unhygienic_example.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-pass
1+
// check-pass
22
// ignore-pretty pretty-printing is unhygienic
33

44
// aux-build:my_crate.rs
File renamed without changes.

0 commit comments

Comments
 (0)