Change query proc macro to be more rust-analyzer friendly #152422

Zoxc · 2026-02-10T06:28:55Z

This changes the query proc macro to be more rust-analyzer friendly.

Types in the macro now have a proper span
Some functions have their span hidden so they don't show up when hovering over the query name
Added a hint on the provider field on how to find providers. That is shown when hovering over the query name
Linked query name to the provider field on all queries, not just ones with caching
Added tooltip for the query modifiers by linking to the new types in rustc_middle:::query::modifiers

rustbot · 2026-02-10T06:29:00Z

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 21 candidates
Random selection from 13 candidates

fmease · 2026-02-10T20:13:12Z

I might take a look at this PR but I'm not sure if I'm the right person since I've disabled proc-macro expansion for r-l/r checkouts to avoid rust analyzer frying my machine, so I can't really experiment with this patch locally.

Zoxc · 2026-02-11T02:41:28Z

r? @Zalathar

compiler/rustc_macros/src/query.rs

Zalathar · 2026-02-11T04:57:28Z

I was initially worried about this breaking hover-docs and find-all-references (for the query method) from queries.rs, but it turns out that those already don't work. 😅

(They do appear to still work for calls to the query method.)

Zalathar · 2026-02-11T12:05:48Z

I'm not seeing any tooltips for the query modifiers on my machine; hovering over the modifier name in the query body doesn't show anything for me.

Is it working for you?

compiler/rustc_macros/src/query.rs

Zoxc · 2026-02-11T13:16:51Z

Is it working for you?

Yeah, on rust-analyzer 0.3.2786-standalone (c75729db68 2026-02-09). Do you see any other changes? It takes a while to compile the proc macros with rust-analyzer, so make sure its idle.

Zalathar · 2026-02-12T02:09:13Z

Yeah, on rust-analyzer 0.3.2786-standalone (c75729db68 2026-02-09). Do you see any other changes? It takes a while to compile the proc macros with rust-analyzer, so make sure its idle.

I updated r-a and hovering on modifiers works for me now, so it must have been sensitive to a recent change. 👍

Zalathar · 2026-02-12T02:13:34Z

Looks good, thanks.

@bors r+

rust-bors · 2026-02-12T02:13:36Z

📌 Commit 47b4e02 has been approved by Zalathar

It is now in the queue for this repository.

Change query proc macro to be more rust-analyzer friendly This changes the query proc macro to be more rust-analyzer friendly. - Types in the macro now have a proper span - Some functions have their span hidden so they don't show up when hovering over the query name - Added a hint on the provider field on how to find providers. That is shown when hovering over the query name - Linked query name to the provider field on all queries, not just ones with caching - Added tooltip for the query modifiers by linking to the new types in `rustc_middle:::query::modifiers`

compiler/rustc_middle/src/query/modifiers.rs

rustbot · 2026-02-12T11:40:24Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Zalathar · 2026-02-12T11:54:07Z

@bors r+

rust-bors · 2026-02-12T11:54:11Z

📌 Commit 8cc4b93 has been approved by Zalathar

It is now in the queue for this repository.

Change query proc macro to be more rust-analyzer friendly This changes the query proc macro to be more rust-analyzer friendly. - Types in the macro now have a proper span - Some functions have their span hidden so they don't show up when hovering over the query name - Added a hint on the provider field on how to find providers. That is shown when hovering over the query name - Linked query name to the provider field on all queries, not just ones with caching - Added tooltip for the query modifiers by linking to the new types in `rustc_middle:::query::modifiers`

…uwer Rollup of 11 pull requests Successful merges: - #146901 (Support AVRTiny devices in AVR inline assembly) - #150988 (Improve code suggestion for incorrect macro_rules! usage) - #152422 (Change query proc macro to be more rust-analyzer friendly) - #152496 (Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto) - #152520 (Don't use `DepContext` in `rustc_middle::traits::cache`) - #152528 (Support serializing CodegenContext) - #152082 (Move tests) - #152444 (`-Znext-solver` Prevent committing unfulfilled unsized coercion) - #152486 (remove redundant backchain attribute in codegen) - #152529 (sparc64: enable abi compatibility test) - #152548 (reject inline const patterns pre-expansion)

Change query proc macro to be more rust-analyzer friendly This changes the query proc macro to be more rust-analyzer friendly. - Types in the macro now have a proper span - Some functions have their span hidden so they don't show up when hovering over the query name - Added a hint on the provider field on how to find providers. That is shown when hovering over the query name - Linked query name to the provider field on all queries, not just ones with caching - Added tooltip for the query modifiers by linking to the new types in `rustc_middle:::query::modifiers`

Rollup of 18 pull requests Successful merges: - #150551 (Compute localized outlives constraints lazily) - #150752 (Update libc to v0.2.181) - #150988 (Improve code suggestion for incorrect macro_rules! usage) - #152422 (Change query proc macro to be more rust-analyzer friendly) - #152496 (Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto) - #152514 (Collect active query jobs into struct `QueryJobMap`) - #152520 (Don't use `DepContext` in `rustc_middle::traits::cache`) - #152528 (Support serializing CodegenContext) - #152082 (Move tests) - #152232 (Add must_use for FileTimes) - #152329 (Simplify parallel! macro) - #152444 (`-Znext-solver` Prevent committing unfulfilled unsized coercion) - #152486 (remove redundant backchain attribute in codegen) - #152519 (Fix feature gating for new `try bikeshed` expressions) - #152529 (sparc64: enable abi compatibility test) - #152548 (reject inline const patterns pre-expansion) - #152550 (Port #[prelude_import] to the attribute parser) - #152552 (Add 2048-bit HvxVectorPair support to Hexagon SIMD ABI checks)

Change query proc macro to be more rust-analyzer friendly This changes the query proc macro to be more rust-analyzer friendly. - Types in the macro now have a proper span - Some functions have their span hidden so they don't show up when hovering over the query name - Added a hint on the provider field on how to find providers. That is shown when hovering over the query name - Linked query name to the provider field on all queries, not just ones with caching - Added tooltip for the query modifiers by linking to the new types in `rustc_middle:::query::modifiers`

Rollup of 17 pull requests Successful merges: - #150551 (Compute localized outlives constraints lazily) - #150988 (Improve code suggestion for incorrect macro_rules! usage) - #152422 (Change query proc macro to be more rust-analyzer friendly) - #152496 (Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto) - #152514 (Collect active query jobs into struct `QueryJobMap`) - #152520 (Don't use `DepContext` in `rustc_middle::traits::cache`) - #152528 (Support serializing CodegenContext) - #152082 (Move tests) - #152232 (Add must_use for FileTimes) - #152329 (Simplify parallel! macro) - #152444 (`-Znext-solver` Prevent committing unfulfilled unsized coercion) - #152486 (remove redundant backchain attribute in codegen) - #152519 (Fix feature gating for new `try bikeshed` expressions) - #152529 (sparc64: enable abi compatibility test) - #152548 (reject inline const patterns pre-expansion) - #152550 (Port #[prelude_import] to the attribute parser) - #152552 (Add 2048-bit HvxVectorPair support to Hexagon SIMD ABI checks) Failed merges: - #152515 (Extract `DepKindVTable` constructors to their own module)

rustbot assigned fmease Feb 10, 2026

This comment has been minimized.

Sign in to view

rustbot assigned Zalathar and unassigned fmease Feb 11, 2026

Zalathar reviewed Feb 11, 2026

View reviewed changes

compiler/rustc_macros/src/query.rs Show resolved Hide resolved

Zalathar reviewed Feb 11, 2026

View reviewed changes

compiler/rustc_macros/src/query.rs Outdated Show resolved Hide resolved

Zalathar reviewed Feb 11, 2026

View reviewed changes

compiler/rustc_macros/src/query.rs Outdated Show resolved Hide resolved

Zoxc force-pushed the query-macro-tweaks branch from cc3d630 to 1aaa7b0 Compare February 11, 2026 04:56

This comment has been minimized.

Sign in to view

Zalathar reviewed Feb 11, 2026

View reviewed changes

compiler/rustc_macros/src/query.rs Outdated Show resolved Hide resolved

Zoxc force-pushed the query-macro-tweaks branch from 1aaa7b0 to 47b4e02 Compare February 11, 2026 13:15

This comment has been minimized.

Sign in to view

rust-bors bot 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 Feb 12, 2026

Zalathar mentioned this pull request Feb 12, 2026

[EXPERIMENT] Rollup of 18 pull requests #152513

Closed

rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 12, 2026

This comment has been minimized.

Sign in to view

Zalathar reviewed Feb 12, 2026

View reviewed changes

compiler/rustc_middle/src/query/modifiers.rs Show resolved Hide resolved

Change query proc macro to be more rust-analyzer friendly

8cc4b93

Zoxc force-pushed the query-macro-tweaks branch from 47b4e02 to 8cc4b93 Compare February 12, 2026 11:40

rust-bors bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 12, 2026

JonathanBrouwer mentioned this pull request Feb 12, 2026

Rollup of 9 pull requests #152547

Closed

JonathanBrouwer mentioned this pull request Feb 12, 2026

Rollup of 11 pull requests #152551

Closed

Zalathar mentioned this pull request Feb 13, 2026

Rollup of 18 pull requests #152560

Closed

Zalathar mentioned this pull request Feb 13, 2026

Rollup of 17 pull requests #152562

Open

Uh oh!

Change query proc macro to be more rust-analyzer friendly #152422

Are you sure you want to change the base?

Change query proc macro to be more rust-analyzer friendly #152422

Conversation

Zoxc commented Feb 10, 2026

Uh oh!

rustbot commented Feb 10, 2026

Uh oh!

fmease commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Zoxc commented Feb 11, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Zalathar commented Feb 11, 2026

Uh oh!

Zalathar commented Feb 11, 2026

Uh oh!

Uh oh!

Zoxc commented Feb 11, 2026

Uh oh!

This comment has been minimized.

Zalathar commented Feb 12, 2026

Uh oh!

Zalathar commented Feb 12, 2026

Uh oh!

rust-bors bot commented Feb 12, 2026

Uh oh!

This comment has been minimized.

Uh oh!

rustbot commented Feb 12, 2026

Uh oh!

Zalathar commented Feb 12, 2026

Uh oh!

rust-bors bot commented Feb 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fmease commented Feb 10, 2026 •

edited

Loading