Skip to content

Commit 05146ab

Browse files
authored
Rollup merge of rust-lang#143514 - joshtriplett:macro-test-organization, r=jieyouxu
Organize macro tests a bit more - Move some macro parsing tests from `tests/ui/parser` to `tests/ui/parser/macro`. - Most macro tests use `macro` in the name, making it easy to find and run tests relevant to macros. However, a few use `mbe` instead. Rename those to say `macro`.
2 parents bae6714 + 131cffb commit 05146ab

File tree

39 files changed

+11
-11
lines changed

39 files changed

+11
-11
lines changed
File renamed without changes.

tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.stderr renamed to tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: ty
2-
--> $DIR/mbe-async-trait-bound-theoretical-regression.rs:8:19
2+
--> $DIR/macro-async-trait-bound-theoretical-regression.rs:8:19
33
|
44
LL | ($ty:ty) => { compile_error!("ty"); };
55
| ^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | demo! { impl async Trait }
1010
= note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
1111

1212
error: ty
13-
--> $DIR/mbe-async-trait-bound-theoretical-regression.rs:8:19
13+
--> $DIR/macro-async-trait-bound-theoretical-regression.rs:8:19
1414
|
1515
LL | ($ty:ty) => { compile_error!("ty"); };
1616
| ^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ LL | demo! { dyn async Trait }
2121
= note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
2222

2323
error[E0658]: `async` trait bounds are unstable
24-
--> $DIR/mbe-async-trait-bound-theoretical-regression.rs:15:14
24+
--> $DIR/macro-async-trait-bound-theoretical-regression.rs:15:14
2525
|
2626
LL | demo! { impl async Trait }
2727
| ^^^^^
@@ -32,7 +32,7 @@ LL | demo! { impl async Trait }
3232
= help: use the desugared name of the async trait, such as `AsyncFn`
3333

3434
error[E0658]: `async` trait bounds are unstable
35-
--> $DIR/mbe-async-trait-bound-theoretical-regression.rs:18:13
35+
--> $DIR/macro-async-trait-bound-theoretical-regression.rs:18:13
3636
|
3737
LL | demo! { dyn async Trait }
3838
| ^^^^^
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)