fix: Parse cargo config files with origins #21015
Open
+319
−256
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
ShoyuVanilla
force-pushed
the
cargo-config-origin
branch
from
34cbc1f to
05e273e
Compare
ShoyuVanilla
commented
Nov 10, 2025
| } | ||
| }) | ||
| .collect(); | ||
|
|
Member
Author
There was a problem hiding this comment.
This isn't needed anymore in favor of more correct handling in https://github.com/rust-lang/rust-analyzer/pull/21015/files#diff-f8eec93ade9e903194d42ec18dbc7494e9fbd263d9aa5f6217994623c7fd2cecR78
ShoyuVanilla
commented
Nov 10, 2025
| ) -> Option<Self> { | ||
| let mut cargo_config = sysroot.tool(Tool::Cargo, manifest.parent(), extra_env); | ||
| cargo_config | ||
| .args(["-Z", "unstable-options", "config", "get", "--format", "toml", "--show-origin"]) |
Member
Author
There was a problem hiding this comment.
Currently, --show-origin flag works only with toml format
ShoyuVanilla
force-pushed
the
cargo-config-origin
branch
4 times, most recently
from
48e160f to
3374118
Compare
ChayimFriedman2
approved these changes
Nov 17, 2025
Contributor
ChayimFriedman2
left a comment
ChayimFriedman2
left a comment
There was a problem hiding this comment.
This feels quite hacky, but if there is no other way then LGTM. We can't merge this yet until we solve the subtree problem, though.
| let toml = DeTable::parse(toml_str) | ||
| .inspect_err(|err| tracing::debug!("Failed to parse cargo config into toml: {err:?}")) | ||
| .ok()?; | ||
| let line_ends = toml_str.lines().fold(vec![], |mut acc, l| { |
Contributor
There was a problem hiding this comment.
map().collect() instead?
ShoyuVanilla
force-pushed
the
cargo-config-origin
branch
from
3374118 to
8aad85e
Compare
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.
Fixes #20932
The example outputs of
cargo config get --format toml --show-originare in https://github.com/rust-lang/cargo/blob/8c4a25c6d68b2be0b65cfda8c31aab58c88d4cbd/tests/testsuite/cargo_config/mod.rs