From 6d64306df1d834966a23a27c085c043214668181 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 5 Jul 2025 16:52:59 -0700 Subject: [PATCH 1/2] Move macro tests in `parser` into `macro` directory The `macro` directory contains most of the macro tests, but not all of them; move the remainder into `macro`. --- tests/ui/parser/{ => macro}/break-in-unlabeled-block-in-macro.rs | 0 .../parser/{ => macro}/break-in-unlabeled-block-in-macro.stderr | 0 ...-semicolon-between-macro-without-exclamation-mark-and-array.rs | 0 ...icolon-between-macro-without-exclamation-mark-and-array.stderr | 0 tests/ui/parser/{ => macro}/extern-abi-from-mac-literal-frag.rs | 0 tests/ui/parser/{ => macro}/lit-err-in-macro.rs | 0 tests/ui/parser/{ => macro}/lit-err-in-macro.stderr | 0 tests/ui/parser/{ => macro}/macro-bad-delimiter-ident.rs | 0 tests/ui/parser/{ => macro}/macro-bad-delimiter-ident.stderr | 0 tests/ui/parser/{ => macro}/macro-braces-dot-question.rs | 0 tests/ui/parser/{ => macro}/macro-keyword.rs | 0 tests/ui/parser/{ => macro}/macro-keyword.stderr | 0 tests/ui/parser/{ => macro}/macro-mismatched-delim-brace-paren.rs | 0 .../parser/{ => macro}/macro-mismatched-delim-brace-paren.stderr | 0 tests/ui/parser/{ => macro}/macro-mismatched-delim-paren-brace.rs | 0 .../parser/{ => macro}/macro-mismatched-delim-paren-brace.stderr | 0 tests/ui/parser/{ => macro}/macros-no-semicolon-items.rs | 0 tests/ui/parser/{ => macro}/macros-no-semicolon-items.stderr | 0 tests/ui/parser/{ => macro}/macros-no-semicolon.rs | 0 tests/ui/parser/{ => macro}/macros-no-semicolon.stderr | 0 tests/ui/parser/{ => macro}/mbe_missing_right_paren.rs | 0 tests/ui/parser/{ => macro}/mbe_missing_right_paren.stderr | 0 tests/ui/parser/{ => macro}/misspelled-macro-rules.fixed | 0 tests/ui/parser/{ => macro}/misspelled-macro-rules.rs | 0 tests/ui/parser/{ => macro}/misspelled-macro-rules.stderr | 0 tests/ui/parser/{ => macro}/pub-method-macro.rs | 0 tests/ui/parser/{ => macro}/pub-method-macro.stderr | 0 tests/ui/parser/{ => macro}/semi-after-closure-in-macro.rs | 0 tests/ui/parser/{ => macro}/trailing-question-in-macro-type.rs | 0 .../ui/parser/{ => macro}/trailing-question-in-macro-type.stderr | 0 30 files changed, 0 insertions(+), 0 deletions(-) rename tests/ui/parser/{ => macro}/break-in-unlabeled-block-in-macro.rs (100%) rename tests/ui/parser/{ => macro}/break-in-unlabeled-block-in-macro.stderr (100%) rename tests/ui/parser/{ => macro}/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs (100%) rename tests/ui/parser/{ => macro}/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr (100%) rename tests/ui/parser/{ => macro}/extern-abi-from-mac-literal-frag.rs (100%) rename tests/ui/parser/{ => macro}/lit-err-in-macro.rs (100%) rename tests/ui/parser/{ => macro}/lit-err-in-macro.stderr (100%) rename tests/ui/parser/{ => macro}/macro-bad-delimiter-ident.rs (100%) rename tests/ui/parser/{ => macro}/macro-bad-delimiter-ident.stderr (100%) rename tests/ui/parser/{ => macro}/macro-braces-dot-question.rs (100%) rename tests/ui/parser/{ => macro}/macro-keyword.rs (100%) rename tests/ui/parser/{ => macro}/macro-keyword.stderr (100%) rename tests/ui/parser/{ => macro}/macro-mismatched-delim-brace-paren.rs (100%) rename tests/ui/parser/{ => macro}/macro-mismatched-delim-brace-paren.stderr (100%) rename tests/ui/parser/{ => macro}/macro-mismatched-delim-paren-brace.rs (100%) rename tests/ui/parser/{ => macro}/macro-mismatched-delim-paren-brace.stderr (100%) rename tests/ui/parser/{ => macro}/macros-no-semicolon-items.rs (100%) rename tests/ui/parser/{ => macro}/macros-no-semicolon-items.stderr (100%) rename tests/ui/parser/{ => macro}/macros-no-semicolon.rs (100%) rename tests/ui/parser/{ => macro}/macros-no-semicolon.stderr (100%) rename tests/ui/parser/{ => macro}/mbe_missing_right_paren.rs (100%) rename tests/ui/parser/{ => macro}/mbe_missing_right_paren.stderr (100%) rename tests/ui/parser/{ => macro}/misspelled-macro-rules.fixed (100%) rename tests/ui/parser/{ => macro}/misspelled-macro-rules.rs (100%) rename tests/ui/parser/{ => macro}/misspelled-macro-rules.stderr (100%) rename tests/ui/parser/{ => macro}/pub-method-macro.rs (100%) rename tests/ui/parser/{ => macro}/pub-method-macro.stderr (100%) rename tests/ui/parser/{ => macro}/semi-after-closure-in-macro.rs (100%) rename tests/ui/parser/{ => macro}/trailing-question-in-macro-type.rs (100%) rename tests/ui/parser/{ => macro}/trailing-question-in-macro-type.stderr (100%) diff --git a/tests/ui/parser/break-in-unlabeled-block-in-macro.rs b/tests/ui/parser/macro/break-in-unlabeled-block-in-macro.rs similarity index 100% rename from tests/ui/parser/break-in-unlabeled-block-in-macro.rs rename to tests/ui/parser/macro/break-in-unlabeled-block-in-macro.rs diff --git a/tests/ui/parser/break-in-unlabeled-block-in-macro.stderr b/tests/ui/parser/macro/break-in-unlabeled-block-in-macro.stderr similarity index 100% rename from tests/ui/parser/break-in-unlabeled-block-in-macro.stderr rename to tests/ui/parser/macro/break-in-unlabeled-block-in-macro.stderr diff --git a/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs b/tests/ui/parser/macro/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs similarity index 100% rename from tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs rename to tests/ui/parser/macro/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs diff --git a/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr b/tests/ui/parser/macro/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr similarity index 100% rename from tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr rename to tests/ui/parser/macro/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr diff --git a/tests/ui/parser/extern-abi-from-mac-literal-frag.rs b/tests/ui/parser/macro/extern-abi-from-mac-literal-frag.rs similarity index 100% rename from tests/ui/parser/extern-abi-from-mac-literal-frag.rs rename to tests/ui/parser/macro/extern-abi-from-mac-literal-frag.rs diff --git a/tests/ui/parser/lit-err-in-macro.rs b/tests/ui/parser/macro/lit-err-in-macro.rs similarity index 100% rename from tests/ui/parser/lit-err-in-macro.rs rename to tests/ui/parser/macro/lit-err-in-macro.rs diff --git a/tests/ui/parser/lit-err-in-macro.stderr b/tests/ui/parser/macro/lit-err-in-macro.stderr similarity index 100% rename from tests/ui/parser/lit-err-in-macro.stderr rename to tests/ui/parser/macro/lit-err-in-macro.stderr diff --git a/tests/ui/parser/macro-bad-delimiter-ident.rs b/tests/ui/parser/macro/macro-bad-delimiter-ident.rs similarity index 100% rename from tests/ui/parser/macro-bad-delimiter-ident.rs rename to tests/ui/parser/macro/macro-bad-delimiter-ident.rs diff --git a/tests/ui/parser/macro-bad-delimiter-ident.stderr b/tests/ui/parser/macro/macro-bad-delimiter-ident.stderr similarity index 100% rename from tests/ui/parser/macro-bad-delimiter-ident.stderr rename to tests/ui/parser/macro/macro-bad-delimiter-ident.stderr diff --git a/tests/ui/parser/macro-braces-dot-question.rs b/tests/ui/parser/macro/macro-braces-dot-question.rs similarity index 100% rename from tests/ui/parser/macro-braces-dot-question.rs rename to tests/ui/parser/macro/macro-braces-dot-question.rs diff --git a/tests/ui/parser/macro-keyword.rs b/tests/ui/parser/macro/macro-keyword.rs similarity index 100% rename from tests/ui/parser/macro-keyword.rs rename to tests/ui/parser/macro/macro-keyword.rs diff --git a/tests/ui/parser/macro-keyword.stderr b/tests/ui/parser/macro/macro-keyword.stderr similarity index 100% rename from tests/ui/parser/macro-keyword.stderr rename to tests/ui/parser/macro/macro-keyword.stderr diff --git a/tests/ui/parser/macro-mismatched-delim-brace-paren.rs b/tests/ui/parser/macro/macro-mismatched-delim-brace-paren.rs similarity index 100% rename from tests/ui/parser/macro-mismatched-delim-brace-paren.rs rename to tests/ui/parser/macro/macro-mismatched-delim-brace-paren.rs diff --git a/tests/ui/parser/macro-mismatched-delim-brace-paren.stderr b/tests/ui/parser/macro/macro-mismatched-delim-brace-paren.stderr similarity index 100% rename from tests/ui/parser/macro-mismatched-delim-brace-paren.stderr rename to tests/ui/parser/macro/macro-mismatched-delim-brace-paren.stderr diff --git a/tests/ui/parser/macro-mismatched-delim-paren-brace.rs b/tests/ui/parser/macro/macro-mismatched-delim-paren-brace.rs similarity index 100% rename from tests/ui/parser/macro-mismatched-delim-paren-brace.rs rename to tests/ui/parser/macro/macro-mismatched-delim-paren-brace.rs diff --git a/tests/ui/parser/macro-mismatched-delim-paren-brace.stderr b/tests/ui/parser/macro/macro-mismatched-delim-paren-brace.stderr similarity index 100% rename from tests/ui/parser/macro-mismatched-delim-paren-brace.stderr rename to tests/ui/parser/macro/macro-mismatched-delim-paren-brace.stderr diff --git a/tests/ui/parser/macros-no-semicolon-items.rs b/tests/ui/parser/macro/macros-no-semicolon-items.rs similarity index 100% rename from tests/ui/parser/macros-no-semicolon-items.rs rename to tests/ui/parser/macro/macros-no-semicolon-items.rs diff --git a/tests/ui/parser/macros-no-semicolon-items.stderr b/tests/ui/parser/macro/macros-no-semicolon-items.stderr similarity index 100% rename from tests/ui/parser/macros-no-semicolon-items.stderr rename to tests/ui/parser/macro/macros-no-semicolon-items.stderr diff --git a/tests/ui/parser/macros-no-semicolon.rs b/tests/ui/parser/macro/macros-no-semicolon.rs similarity index 100% rename from tests/ui/parser/macros-no-semicolon.rs rename to tests/ui/parser/macro/macros-no-semicolon.rs diff --git a/tests/ui/parser/macros-no-semicolon.stderr b/tests/ui/parser/macro/macros-no-semicolon.stderr similarity index 100% rename from tests/ui/parser/macros-no-semicolon.stderr rename to tests/ui/parser/macro/macros-no-semicolon.stderr diff --git a/tests/ui/parser/mbe_missing_right_paren.rs b/tests/ui/parser/macro/mbe_missing_right_paren.rs similarity index 100% rename from tests/ui/parser/mbe_missing_right_paren.rs rename to tests/ui/parser/macro/mbe_missing_right_paren.rs diff --git a/tests/ui/parser/mbe_missing_right_paren.stderr b/tests/ui/parser/macro/mbe_missing_right_paren.stderr similarity index 100% rename from tests/ui/parser/mbe_missing_right_paren.stderr rename to tests/ui/parser/macro/mbe_missing_right_paren.stderr diff --git a/tests/ui/parser/misspelled-macro-rules.fixed b/tests/ui/parser/macro/misspelled-macro-rules.fixed similarity index 100% rename from tests/ui/parser/misspelled-macro-rules.fixed rename to tests/ui/parser/macro/misspelled-macro-rules.fixed diff --git a/tests/ui/parser/misspelled-macro-rules.rs b/tests/ui/parser/macro/misspelled-macro-rules.rs similarity index 100% rename from tests/ui/parser/misspelled-macro-rules.rs rename to tests/ui/parser/macro/misspelled-macro-rules.rs diff --git a/tests/ui/parser/misspelled-macro-rules.stderr b/tests/ui/parser/macro/misspelled-macro-rules.stderr similarity index 100% rename from tests/ui/parser/misspelled-macro-rules.stderr rename to tests/ui/parser/macro/misspelled-macro-rules.stderr diff --git a/tests/ui/parser/pub-method-macro.rs b/tests/ui/parser/macro/pub-method-macro.rs similarity index 100% rename from tests/ui/parser/pub-method-macro.rs rename to tests/ui/parser/macro/pub-method-macro.rs diff --git a/tests/ui/parser/pub-method-macro.stderr b/tests/ui/parser/macro/pub-method-macro.stderr similarity index 100% rename from tests/ui/parser/pub-method-macro.stderr rename to tests/ui/parser/macro/pub-method-macro.stderr diff --git a/tests/ui/parser/semi-after-closure-in-macro.rs b/tests/ui/parser/macro/semi-after-closure-in-macro.rs similarity index 100% rename from tests/ui/parser/semi-after-closure-in-macro.rs rename to tests/ui/parser/macro/semi-after-closure-in-macro.rs diff --git a/tests/ui/parser/trailing-question-in-macro-type.rs b/tests/ui/parser/macro/trailing-question-in-macro-type.rs similarity index 100% rename from tests/ui/parser/trailing-question-in-macro-type.rs rename to tests/ui/parser/macro/trailing-question-in-macro-type.rs diff --git a/tests/ui/parser/trailing-question-in-macro-type.stderr b/tests/ui/parser/macro/trailing-question-in-macro-type.stderr similarity index 100% rename from tests/ui/parser/trailing-question-in-macro-type.stderr rename to tests/ui/parser/macro/trailing-question-in-macro-type.stderr From 131cffb6baca60f119c33f2599a0e6051b05c365 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 5 Jul 2025 16:57:24 -0700 Subject: [PATCH 2/2] Rename tests named with `mbe` to use `macro` instead 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`. --- ... => macro-async-trait-bound-theoretical-regression.rs} | 0 ...macro-async-trait-bound-theoretical-regression.stderr} | 8 ++++---- ...nd.rs => macro-bare-trait-object-maybe-trait-bound.rs} | 0 ...-a-type.rs => macro-dotdotdot-may-not-begin-a-type.rs} | 0 ...issing_right_paren.rs => macro-missing-right-paren.rs} | 0 ...ight_paren.stderr => macro-missing-right-paren.stderr} | 2 +- ....rs => macro-bare-trait-objects-const-trait-bounds.rs} | 0 ...=> macro-bare-trait-objects-const-trait-bounds.stderr} | 4 ++-- ... => macro-const-trait-bound-theoretical-regression.rs} | 0 ...macro-const-trait-bound-theoretical-regression.stderr} | 8 ++++---- .../{mbe-dyn-const-2015.rs => macro-dyn-const-2015.rs} | 0 11 files changed, 11 insertions(+), 11 deletions(-) rename tests/ui/async-await/async-fn/{mbe-async-trait-bound-theoretical-regression.rs => macro-async-trait-bound-theoretical-regression.rs} (100%) rename tests/ui/async-await/async-fn/{mbe-async-trait-bound-theoretical-regression.stderr => macro-async-trait-bound-theoretical-regression.stderr} (86%) rename tests/ui/parser/macro/{mbe-bare-trait-object-maybe-trait-bound.rs => macro-bare-trait-object-maybe-trait-bound.rs} (100%) rename tests/ui/parser/macro/{mbe-dotdotdot-may-not-begin-a-type.rs => macro-dotdotdot-may-not-begin-a-type.rs} (100%) rename tests/ui/parser/macro/{mbe_missing_right_paren.rs => macro-missing-right-paren.rs} (100%) rename tests/ui/parser/macro/{mbe_missing_right_paren.stderr => macro-missing-right-paren.stderr} (82%) rename tests/ui/traits/const-traits/{mbe-bare-trait-objects-const-trait-bounds.rs => macro-bare-trait-objects-const-trait-bounds.rs} (100%) rename tests/ui/traits/const-traits/{mbe-bare-trait-objects-const-trait-bounds.stderr => macro-bare-trait-objects-const-trait-bounds.stderr} (84%) rename tests/ui/traits/const-traits/{mbe-const-trait-bound-theoretical-regression.rs => macro-const-trait-bound-theoretical-regression.rs} (100%) rename tests/ui/traits/const-traits/{mbe-const-trait-bound-theoretical-regression.stderr => macro-const-trait-bound-theoretical-regression.stderr} (85%) rename tests/ui/traits/const-traits/{mbe-dyn-const-2015.rs => macro-dyn-const-2015.rs} (100%) diff --git a/tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.rs b/tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.rs similarity index 100% rename from tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.rs rename to tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.rs diff --git a/tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.stderr b/tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.stderr similarity index 86% rename from tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.stderr rename to tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.stderr index a463944d1133e..6c3044e64d20c 100644 --- a/tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.stderr +++ b/tests/ui/async-await/async-fn/macro-async-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/tests/ui/parser/macro/mbe-bare-trait-object-maybe-trait-bound.rs b/tests/ui/parser/macro/macro-bare-trait-object-maybe-trait-bound.rs similarity index 100% rename from tests/ui/parser/macro/mbe-bare-trait-object-maybe-trait-bound.rs rename to tests/ui/parser/macro/macro-bare-trait-object-maybe-trait-bound.rs diff --git a/tests/ui/parser/macro/mbe-dotdotdot-may-not-begin-a-type.rs b/tests/ui/parser/macro/macro-dotdotdot-may-not-begin-a-type.rs similarity index 100% rename from tests/ui/parser/macro/mbe-dotdotdot-may-not-begin-a-type.rs rename to tests/ui/parser/macro/macro-dotdotdot-may-not-begin-a-type.rs diff --git a/tests/ui/parser/macro/mbe_missing_right_paren.rs b/tests/ui/parser/macro/macro-missing-right-paren.rs similarity index 100% rename from tests/ui/parser/macro/mbe_missing_right_paren.rs rename to tests/ui/parser/macro/macro-missing-right-paren.rs diff --git a/tests/ui/parser/macro/mbe_missing_right_paren.stderr b/tests/ui/parser/macro/macro-missing-right-paren.stderr similarity index 82% rename from tests/ui/parser/macro/mbe_missing_right_paren.stderr rename to tests/ui/parser/macro/macro-missing-right-paren.stderr index d45a2e3ab5298..285f14830ce66 100644 --- a/tests/ui/parser/macro/mbe_missing_right_paren.stderr +++ b/tests/ui/parser/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/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.rs b/tests/ui/traits/const-traits/macro-bare-trait-objects-const-trait-bounds.rs similarity index 100% rename from tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.rs rename to tests/ui/traits/const-traits/macro-bare-trait-objects-const-trait-bounds.rs diff --git a/tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.stderr b/tests/ui/traits/const-traits/macro-bare-trait-objects-const-trait-bounds.stderr similarity index 84% rename from tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.stderr rename to tests/ui/traits/const-traits/macro-bare-trait-objects-const-trait-bounds.stderr index 56dad5301a4a3..bc0e48112b9b8 100644 --- a/tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.stderr +++ b/tests/ui/traits/const-traits/macro-bare-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/tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.rs b/tests/ui/traits/const-traits/macro-const-trait-bound-theoretical-regression.rs similarity index 100% rename from tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.rs rename to tests/ui/traits/const-traits/macro-const-trait-bound-theoretical-regression.rs diff --git a/tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.stderr b/tests/ui/traits/const-traits/macro-const-trait-bound-theoretical-regression.stderr similarity index 85% rename from tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.stderr rename to tests/ui/traits/const-traits/macro-const-trait-bound-theoretical-regression.stderr index f4b401b738699..5dd648554c9fa 100644 --- a/tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.stderr +++ b/tests/ui/traits/const-traits/macro-const-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/tests/ui/traits/const-traits/mbe-dyn-const-2015.rs b/tests/ui/traits/const-traits/macro-dyn-const-2015.rs similarity index 100% rename from tests/ui/traits/const-traits/mbe-dyn-const-2015.rs rename to tests/ui/traits/const-traits/macro-dyn-const-2015.rs