rust-lang · bors · Jul 6, 2025 · Jul 5, 2025 · Jul 5, 2025
diff --git a/...ync-trait-bound-theoretical-regression.rs → ...ync-trait-bound-theoretical-regression.rs b/...ync-trait-bound-theoretical-regression.rs → ...ync-trait-bound-theoretical-regression.rs
diff --git a/...trait-bound-theoretical-regression.stderr → ...trait-bound-theoretical-regression.stderr b/...trait-bound-theoretical-regression.stderr → ...trait-bound-theoretical-regression.stderr
@@ -1,5 +1,5 @@
 error: ty
-  --> $DIR/mbe-async-trait-bound-theoretical-regression.rs:8:19
+  --> $DIR/macro-async-trait-bound-theoretical-regression.rs:8:19
    |
 LL |     ($ty:ty) => { compile_error!("ty"); };
    |                   ^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | demo! { impl async Trait }
    = note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: ty
-  --> $DIR/mbe-async-trait-bound-theoretical-regression.rs:8:19
+  --> $DIR/macro-async-trait-bound-theoretical-regression.rs:8:19
    |
 LL |     ($ty:ty) => { compile_error!("ty"); };
    |                   ^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ LL | demo! { dyn async Trait }
    = note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: `async` trait bounds are unstable
-  --> $DIR/mbe-async-trait-bound-theoretical-regression.rs:15:14
+  --> $DIR/macro-async-trait-bound-theoretical-regression.rs:15:14
    |
 LL | demo! { impl async Trait }
    |              ^^^^^
@@ -32,7 +32,7 @@ LL | demo! { impl async Trait }
    = help: use the desugared name of the async trait, such as `AsyncFn`
 
 error[E0658]: `async` trait bounds are unstable
-  --> $DIR/mbe-async-trait-bound-theoretical-regression.rs:18:13
+  --> $DIR/macro-async-trait-bound-theoretical-regression.rs:18:13
    |
 LL | demo! { dyn async Trait }
    |             ^^^^^

diff --git a/...rser/break-in-unlabeled-block-in-macro.rs → ...acro/break-in-unlabeled-block-in-macro.rs b/...rser/break-in-unlabeled-block-in-macro.rs → ...acro/break-in-unlabeled-block-in-macro.rs
diff --git a/.../break-in-unlabeled-block-in-macro.stderr → .../break-in-unlabeled-block-in-macro.stderr b/.../break-in-unlabeled-block-in-macro.stderr → .../break-in-unlabeled-block-in-macro.stderr
diff --git a/...cro-without-exclamation-mark-and-array.rs → ...cro-without-exclamation-mark-and-array.rs b/...cro-without-exclamation-mark-and-array.rs → ...cro-without-exclamation-mark-and-array.rs
diff --git a/...without-exclamation-mark-and-array.stderr → ...without-exclamation-mark-and-array.stderr b/...without-exclamation-mark-and-array.stderr → ...without-exclamation-mark-and-array.stderr
diff --git a/...arser/extern-abi-from-mac-literal-frag.rs → ...macro/extern-abi-from-mac-literal-frag.rs b/...arser/extern-abi-from-mac-literal-frag.rs → ...macro/extern-abi-from-mac-literal-frag.rs
diff --git a/tests/ui/parser/lit-err-in-macro.rs → tests/ui/parser/macro/lit-err-in-macro.rs b/tests/ui/parser/lit-err-in-macro.rs → tests/ui/parser/macro/lit-err-in-macro.rs
diff --git a/tests/ui/parser/lit-err-in-macro.stderr → ...s/ui/parser/macro/lit-err-in-macro.stderr b/tests/ui/parser/lit-err-in-macro.stderr → ...s/ui/parser/macro/lit-err-in-macro.stderr
diff --git a/tests/ui/parser/macro-bad-delimiter-ident.rs → ...parser/macro/macro-bad-delimiter-ident.rs b/tests/ui/parser/macro-bad-delimiter-ident.rs → ...parser/macro/macro-bad-delimiter-ident.rs
diff --git a/...i/parser/macro-bad-delimiter-ident.stderr → ...er/macro/macro-bad-delimiter-ident.stderr b/...i/parser/macro-bad-delimiter-ident.stderr → ...er/macro/macro-bad-delimiter-ident.stderr
diff --git a/...be-bare-trait-object-maybe-trait-bound.rs → ...ro-bare-trait-object-maybe-trait-bound.rs b/...be-bare-trait-object-maybe-trait-bound.rs → ...ro-bare-trait-object-maybe-trait-bound.rs
diff --git a/tests/ui/parser/macro-braces-dot-question.rs → ...parser/macro/macro-braces-dot-question.rs b/tests/ui/parser/macro-braces-dot-question.rs → ...parser/macro/macro-braces-dot-question.rs
diff --git a/...cro/mbe-dotdotdot-may-not-begin-a-type.rs → ...o/macro-dotdotdot-may-not-begin-a-type.rs b/...cro/mbe-dotdotdot-may-not-begin-a-type.rs → ...o/macro-dotdotdot-may-not-begin-a-type.rs
diff --git a/tests/ui/parser/macro-keyword.rs → tests/ui/parser/macro/macro-keyword.rs b/tests/ui/parser/macro-keyword.rs → tests/ui/parser/macro/macro-keyword.rs
diff --git a/tests/ui/parser/macro-keyword.stderr → tests/ui/parser/macro/macro-keyword.stderr b/tests/ui/parser/macro-keyword.stderr → tests/ui/parser/macro/macro-keyword.stderr
diff --git a/...ser/macro-mismatched-delim-brace-paren.rs → ...cro/macro-mismatched-delim-brace-paren.rs b/...ser/macro-mismatched-delim-brace-paren.rs → ...cro/macro-mismatched-delim-brace-paren.rs
diff --git a/...macro-mismatched-delim-brace-paren.stderr → ...macro-mismatched-delim-brace-paren.stderr b/...macro-mismatched-delim-brace-paren.stderr → ...macro-mismatched-delim-brace-paren.stderr
diff --git a/...ser/macro-mismatched-delim-paren-brace.rs → ...cro/macro-mismatched-delim-paren-brace.rs b/...ser/macro-mismatched-delim-paren-brace.rs → ...cro/macro-mismatched-delim-paren-brace.rs
diff --git a/...macro-mismatched-delim-paren-brace.stderr → ...macro-mismatched-delim-paren-brace.stderr b/...macro-mismatched-delim-paren-brace.stderr → ...macro-mismatched-delim-paren-brace.stderr
diff --git a/tests/ui/parser/mbe_missing_right_paren.rs → ...parser/macro/macro-missing-right-paren.rs b/tests/ui/parser/mbe_missing_right_paren.rs → ...parser/macro/macro-missing-right-paren.rs
diff --git a/.../ui/parser/mbe_missing_right_paren.stderr → ...er/macro/macro-missing-right-paren.stderr b/.../ui/parser/mbe_missing_right_paren.stderr → ...er/macro/macro-missing-right-paren.stderr
@@ -1,5 +1,5 @@
 error: this file contains an unclosed delimiter
-  --> $DIR/mbe_missing_right_paren.rs:3:19
+  --> $DIR/macro-missing-right-paren.rs:3:19
    |
 LL | macro_rules! abc(ؼ
    |                 - ^

diff --git a/tests/ui/parser/macros-no-semicolon-items.rs → ...parser/macro/macros-no-semicolon-items.rs b/tests/ui/parser/macros-no-semicolon-items.rs → ...parser/macro/macros-no-semicolon-items.rs
diff --git a/...i/parser/macros-no-semicolon-items.stderr → ...er/macro/macros-no-semicolon-items.stderr b/...i/parser/macros-no-semicolon-items.stderr → ...er/macro/macros-no-semicolon-items.stderr
diff --git a/tests/ui/parser/macros-no-semicolon.rs → tests/ui/parser/macro/macros-no-semicolon.rs b/tests/ui/parser/macros-no-semicolon.rs → tests/ui/parser/macro/macros-no-semicolon.rs
diff --git a/tests/ui/parser/macros-no-semicolon.stderr → ...i/parser/macro/macros-no-semicolon.stderr b/tests/ui/parser/macros-no-semicolon.stderr → ...i/parser/macro/macros-no-semicolon.stderr
diff --git a/tests/ui/parser/misspelled-macro-rules.fixed → ...parser/macro/misspelled-macro-rules.fixed b/tests/ui/parser/misspelled-macro-rules.fixed → ...parser/macro/misspelled-macro-rules.fixed
diff --git a/tests/ui/parser/misspelled-macro-rules.rs → ...ui/parser/macro/misspelled-macro-rules.rs b/tests/ui/parser/misspelled-macro-rules.rs → ...ui/parser/macro/misspelled-macro-rules.rs
diff --git a/...s/ui/parser/misspelled-macro-rules.stderr → ...arser/macro/misspelled-macro-rules.stderr b/...s/ui/parser/misspelled-macro-rules.stderr → ...arser/macro/misspelled-macro-rules.stderr
diff --git a/tests/ui/parser/pub-method-macro.rs → tests/ui/parser/macro/pub-method-macro.rs b/tests/ui/parser/pub-method-macro.rs → tests/ui/parser/macro/pub-method-macro.rs
diff --git a/tests/ui/parser/pub-method-macro.stderr → ...s/ui/parser/macro/pub-method-macro.stderr b/tests/ui/parser/pub-method-macro.stderr → ...s/ui/parser/macro/pub-method-macro.stderr
diff --git a/.../ui/parser/semi-after-closure-in-macro.rs → ...rser/macro/semi-after-closure-in-macro.rs b/.../ui/parser/semi-after-closure-in-macro.rs → ...rser/macro/semi-after-closure-in-macro.rs
diff --git a/...parser/trailing-question-in-macro-type.rs → .../macro/trailing-question-in-macro-type.rs b/...parser/trailing-question-in-macro-type.rs → .../macro/trailing-question-in-macro-type.rs
diff --git a/...er/trailing-question-in-macro-type.stderr → ...ro/trailing-question-in-macro-type.stderr b/...er/trailing-question-in-macro-type.stderr → ...ro/trailing-question-in-macro-type.stderr
diff --git a/...-bare-trait-objects-const-trait-bounds.rs → ...-bare-trait-objects-const-trait-bounds.rs b/...-bare-trait-objects-const-trait-bounds.rs → ...-bare-trait-objects-const-trait-bounds.rs
diff --git a/...e-trait-objects-const-trait-bounds.stderr → ...e-trait-objects-const-trait-bounds.stderr b/...e-trait-objects-const-trait-bounds.stderr → ...e-trait-objects-const-trait-bounds.stderr
@@ -1,5 +1,5 @@
 error: expected identifier, found `]`
-  --> $DIR/mbe-bare-trait-objects-const-trait-bounds.rs:20:16
+  --> $DIR/macro-bare-trait-objects-const-trait-bounds.rs:20:16
    |
 LL |     ($Type:ty) => {
    |      -------- while parsing argument for this `ty` macro fragment
@@ -8,7 +8,7 @@ LL | check! { [const] Trait }
    |                ^ expected identifier
 
 error[E0658]: const trait impls are experimental
-  --> $DIR/mbe-bare-trait-objects-const-trait-bounds.rs:20:11
+  --> $DIR/macro-bare-trait-objects-const-trait-bounds.rs:20:11
    |
 LL | check! { [const] Trait }
    |           ^^^^^

diff --git a/...nst-trait-bound-theoretical-regression.rs → ...nst-trait-bound-theoretical-regression.rs b/...nst-trait-bound-theoretical-regression.rs → ...nst-trait-bound-theoretical-regression.rs
diff --git a/...trait-bound-theoretical-regression.stderr → ...trait-bound-theoretical-regression.stderr b/...trait-bound-theoretical-regression.stderr → ...trait-bound-theoretical-regression.stderr
@@ -1,5 +1,5 @@
 error: ty
-  --> $DIR/mbe-const-trait-bound-theoretical-regression.rs:8:19
+  --> $DIR/macro-const-trait-bound-theoretical-regression.rs:8:19
    |
 LL |     ($ty:ty) => { compile_error!("ty"); };
    |                   ^^^^^^^^^^^^^^^^^^^^
@@ -10,7 +10,7 @@ LL | demo! { impl const Trait }
    = note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: ty
-  --> $DIR/mbe-const-trait-bound-theoretical-regression.rs:8:19
+  --> $DIR/macro-const-trait-bound-theoretical-regression.rs:8:19
    |
 LL |     ($ty:ty) => { compile_error!("ty"); };
    |                   ^^^^^^^^^^^^^^^^^^^^
@@ -21,7 +21,7 @@ LL | demo! { dyn const Trait }
    = note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: const trait impls are experimental
-  --> $DIR/mbe-const-trait-bound-theoretical-regression.rs:15:14
+  --> $DIR/macro-const-trait-bound-theoretical-regression.rs:15:14
    |
 LL | demo! { impl const Trait }
    |              ^^^^^
@@ -31,7 +31,7 @@ LL | demo! { impl const Trait }
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: const trait impls are experimental
-  --> $DIR/mbe-const-trait-bound-theoretical-regression.rs:18:13
+  --> $DIR/macro-const-trait-bound-theoretical-regression.rs:18:13
    |
 LL | demo! { dyn const Trait }
    |             ^^^^^

diff --git a/...traits/const-traits/mbe-dyn-const-2015.rs → ...aits/const-traits/macro-dyn-const-2015.rs b/...traits/const-traits/mbe-dyn-const-2015.rs → ...aits/const-traits/macro-dyn-const-2015.rs