internal: Share same proc-macro servers between workspaces - #22766
Merged
Conversation
rustbot
added
the
S-waiting-on-review
Veykril
enabled auto-merge
July 11, 2026 13:15
Veykril
force-pushed
the
lukaswirth/push-rwmmzyuozvpl
branch
from
July 11, 2026 13:21
c0bbe40 to
7780736
Compare
Veykril
force-pushed
the
lukaswirth/push-rwmmzyuozvpl
branch
from
July 11, 2026 13:29
7780736 to
0c0815c
Compare
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 11, 2026
rustbot
removed
the
S-waiting-on-review
Wilfred
added a commit
to Wilfred/rust-analyzer
that referenced
this pull request
Aug 10, 2026
fetch_proc_macros() zips proc_macro_clients with a per-workspace vec. We therefore require proc_macro_clients to have an item for every workspace, or we get "proc-macro-srv is not running" and no macro expansion for some workspaces. This issue is more noticeable when using a discovery command, where it's common to have have several workspaces, but it can occur in plain cargo repositories too. The logic was essentially `if !same_workspaces`, but this doesn't actually work. When a new workspace is added, switch_workspaces() updates self.workspaces, pushes to fetch_build_data_queue, and returns early. When we actually check the proc macro clients, on the second invocation, we're seeing the *new* self.workspaces already and it looks like nothing has changed! This was broken in rust-lang#22766, and only partially fixed in rust-lang#22865. Revert the code, and expand the doc comments. A better solution would be to track proc macro initialisation state properly, but this fixes r-a on the >1 workspaces case today. AI disclosure: Bisected with help by AI.
Wilfred
added a commit
to Wilfred/rust-analyzer
that referenced
this pull request
Aug 10, 2026
fetch_proc_macros() zips proc_macro_clients with a per-workspace vec. We therefore require proc_macro_clients to have an item for every workspace, or we get "proc-macro-srv is not running" and no macro expansion for some workspaces. This issue is more noticeable when using a discovery command, where it's common to have have several workspaces, but it can occur in plain cargo repositories too. The logic was essentially `if !same_workspaces`, but this doesn't actually work. When a new workspace is added, switch_workspaces() updates self.workspaces, pushes to fetch_build_data_queue, and returns early. When we actually check the proc macro clients, on the second invocation, we're seeing the *new* self.workspaces already and it looks like nothing has changed! This was broken in rust-lang#22766, and only partially fixed in rust-lang#22865. Revert the code, and expand the doc comments. A better solution would be to track proc macro initialisation state properly, but this fixes r-a on the >1 workspaces case today. AI disclosure: Bisected with help by AI.
lnicola
pushed a commit
to lnicola/rust
that referenced
this pull request
Aug 17, 2026
fetch_proc_macros() zips proc_macro_clients with a per-workspace vec. We therefore require proc_macro_clients to have an item for every workspace, or we get "proc-macro-srv is not running" and no macro expansion for some workspaces. This issue is more noticeable when using a discovery command, where it's common to have have several workspaces, but it can occur in plain cargo repositories too. The logic was essentially `if !same_workspaces`, but this doesn't actually work. When a new workspace is added, switch_workspaces() updates self.workspaces, pushes to fetch_build_data_queue, and returns early. When we actually check the proc macro clients, on the second invocation, we're seeing the *new* self.workspaces already and it looks like nothing has changed! This was broken in rust-lang/rust-analyzer#22766, and only partially fixed in rust-lang/rust-analyzer#22865. Revert the code, and expand the doc comments. A better solution would be to track proc macro initialisation state properly, but this fixes r-a on the >1 workspaces case today. AI disclosure: Bisected with help by AI.
PrimeTimeTran
pushed a commit
to PrimeTimeTran/rust-analyzer
that referenced
this pull request
Aug 22, 2026
fetch_proc_macros() zips proc_macro_clients with a per-workspace vec. We therefore require proc_macro_clients to have an item for every workspace, or we get "proc-macro-srv is not running" and no macro expansion for some workspaces. This issue is more noticeable when using a discovery command, where it's common to have have several workspaces, but it can occur in plain cargo repositories too. The logic was essentially `if !same_workspaces`, but this doesn't actually work. When a new workspace is added, switch_workspaces() updates self.workspaces, pushes to fetch_build_data_queue, and returns early. When we actually check the proc macro clients, on the second invocation, we're seeing the *new* self.workspaces already and it looks like nothing has changed! This was broken in rust-lang#22766, and only partially fixed in rust-lang#22865. Revert the code, and expand the doc comments. A better solution would be to track proc macro initialisation state properly, but this fixes r-a on the >1 workspaces case today. AI disclosure: Bisected with help by AI.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also bumps the default proc-macro server count from 1 to 2, I have been test driving this with 4 processes for a long time with no issues.