fix: Allow multiple discover operations #21164
Open
Conversation
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
rustbot
added
the
S-waiting-on-review
Wilfred
commented
Nov 28, 2025
| pub(crate) discover_handles: Vec<discover::DiscoverHandle>, | ||
| pub(crate) discover_sender: Sender<discover::DiscoverProjectMessage>, | ||
| pub(crate) discover_receiver: Receiver<discover::DiscoverProjectMessage>, | ||
| pub(crate) discover_jobs_active: AtomicU32, |
Contributor
Author
There was a problem hiding this comment.
I think this could actually be a plain u32. I saw the mutexes elsewhere in this struct but I'm not accessing this value from other threads.
Member
There was a problem hiding this comment.
It should be a u32, we only write to it in &mut self paths, so there is no point in using an atomic here
Wilfred
force-pushed
the
multiple_discover_requests
branch
from
1cf1798 to
3d78edb
Compare
Member
|
has been a while since that test flaked |
Contributor
Author
|
Huh, it's |
Previously, rust-analyzer would drop discover requests that arrived before we'd finished processing the previous request. Fix this by allowing multiple discover requests to be active. Keep track of the number of discover operations for the quiescence check, and keep the process handles until they terminate.
Wilfred
force-pushed
the
multiple_discover_requests
branch
from
3d78edb to
d2505d9
Compare
Contributor
Author
|
Rebased to trigger another CI run. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Previously, rust-analyzer would drop discover requests that arrived before we'd finished processing the previous request.
This is particularly noticeable when starting VS Code with multiple Rust files which require separate configuration discovery, as only the first file gets IDE features.
Fix this by allowing multiple discover requests to be active. Keep track of the number of discover operations for the quiescence check, and keep the process handles until they terminate.