Rollup of 4 pull requests by JonathanBrouwer · Pull Request #153714 · rust-lang/rust

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

JonathanBrouwer · 2026-03-11T11:55:15Z

Successful merges:

Avoid ICE when an EII declaration conflicts with a constructor #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
Simplify type_of_opaque. #153581 (Simplify type_of_opaque.)
Introduce for_each_query_vtable! to move more code out of query macros #153685 (Introduce for_each_query_vtable! to move more code out of query macros)
remove .ftl checks from tidy #153710 (remove .ftl checks from tidy)

r? @ghost

Create a similar rollup

remove span_delayed_bug

There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off.

This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

…mann Avoid ICE when an EII declaration conflicts with a constructor Fixesrust-lang#153502 When an `#[eii]` declaration conflicts with a tuple-struct constructor of the same name, error recovery can resolve the EII target to the constructor instead of the generated foreign item. `compare_eii_function_types` then assumes that target is a foreign function and later ICEs while building diagnostics. This pull request adds an early guard in `compare_eii_function_types` to skip EII signature comparison unless the resolved target is actually a foreign function.

@oli-obk

Simplify `type_of_opaque`. There is a bunch of complexity supporting the "cannot check whether the hidden type of opaque type satisfies auto traits" error that shows up in `tests/ui/impl-trait/auto-trait-leak.rs`. This is an obscure error that shows up in a single test. If we are willing to downgrade that error message to a cycle error, we can do the following. - Simplify the `type_of_opaque` return value. - Remove the `cycle_stash` query modifier. - Remove the `CyclePlaceholder` type. - Remove the `SelectionError::OpaqueTypeAutoTraitLeakageUnknown` variant. - Remove a `FromCycleError` impl. - Remove `report_opaque_type_auto_trait_leakage`. - Remove the `StashKey::Cycle` variant. - Remove the `CycleErrorHandling::Stash` variant. That's a lot! I think this is a worthwhile trade-off. r? @oli-obk

…cote Introduce `for_each_query_vtable!` to move more code out of query macros After rust-lang#153114 moved a few for-each-query functions into the big `rustc_query_impl::plumbing` macro, I have found that those functions became much harder to navigate and modify, because they no longer have access to ordinary IDE features in rust-analyzer. Even *finding* the functions is considerably harder, because a plain go-to-definition no longer works smoothly. This PR therefore tries to move as much of that code back out of the macro as possible, with the aid of a smaller `for_each_query_vtable!` helper macro. A typical use of that macro looks like this: ```rust for_each_query_vtable!(ALL, tcx, |query| { query_key_hash_verify(query, tcx); }); ``` The result is an outer function consisting almost entirely of plain Rust code, with all of the usual IDE affordances expected of normal Rust code. Because it uses plain Rust syntax, it can also be formatted automatically by rustfmt. Adding another layer of macro-defined macros is not something I propose lightly, but in this case I think the improvement is well worth it: - The outer functions can once again be defined as “normal” Rust functions, right next to their corresponding inner functions, making navigation and modification much easier. - The closure expression is ordinary Rust code that simply gets repeated ~300 times in the expansion, once for each query, in order to account for the variety of key/value/cache types used by different queries. Even within the closure expression, IDE features still *mostly* work, which is an improvement over the status quo. - For future maintainers looking at the call site, the macro's effect should hopefully be pretty obvious and intuitive, reducing the need to even look at the helper macro. And the helper macro itself is largely straightforward, with its biggest complication being that it necessarily uses the `$name` metavar from the outer macro. There should be no change to compiler behaviour. r? nnethercote (or compiler)

remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

JonathanBrouwer · 2026-03-11T11:55:24Z

@bors r+ rollup=never p=5

JonathanBrouwer · 2026-03-11T11:55:28Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

rust-bors · 2026-03-11T11:55:33Z

📌 Commit 3d58edc has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 4 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

…uwer Rollup of 4 pull requests Successful merges: - #153571 (Avoid ICE when an EII declaration conflicts with a constructor) - #153581 (Simplify `type_of_opaque`.) - #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros) - #153710 (remove `.ftl` checks from tidy)

rust-bors · 2026-03-11T15:10:42Z

💔 Test for 818098d failed: CI. Failed job:

auto - dist-various-1 (web logs, enhanced plaintext logs)

rust-bors · 2026-03-11T15:12:55Z

☀️ Try build successful (CI)
Build commit: dbb7cad (dbb7cad9600aa553cc549fe5eda81283593ec59d, parent: a63150b9cb14896fc22f9275c32682423de94d48)

rust-log-analyzer · 2026-03-11T15:20:35Z

A job failed! Check out the build log: (web)(plain enhanced)(plain)

Click to see the possible cause of the failure (guessed by this bot)

rust-bors · 2026-03-11T15:29:49Z

This pull request was unapproved due to being closed.

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

TaKO8Kiand others added 10 commits March 8, 2026 23:04

add regression test for EII declaration conflicting with constructor
6084bf5

avoid ICE when EII target resolves to a constructor
be78a0d
remove span_delayed_bug

remove .ftl checks from tidy
59733c6

Introduce for_each_query_vtable! to move more code out of query macros
0059012

Pass the vtable to alloc_self_profile_query_strings_for_query_cache
d066ff7
This simplifies the inner function's signature, and makes it more consistent with other uses of `for_each_query_vtable!`.

Rollup merge ofrust-lang#153710- cyrgani:tidy-ftl, r=bjorn3
3d58edc
remove `.ftl` checks from tidy These files have been removed following rust-lang/compiler-team#959. Part of rust-lang#151366.

rust-borsBot added the rollup A PR which is a rollup label Mar 11, 2026

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

This comment has been minimized.
Sign in to view

rust-borsBot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

JonathanBrouwer closed this Mar 11, 2026

rust-borsBot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 11, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2026

JonathanBrouwer deleted the rollup-TbcSvLX branch August 21, 2026 08:17

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-borsBot commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

rust-log-analyzer commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-borsBot commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

rust-log-analyzer commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-borsBot commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

rust-log-analyzer commented Mar 11, 2026

Uh oh!

rust-borsBot commented Mar 11, 2026

Uh oh!

Reviewers