fix: non-mergeable list from config cli merge the same way #16219
+47
−26
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
This show the problematic merge order of non-mergeable list <rust-lang#16209>
rustbot
added
A-configuration
Collaborator
weihanglo
force-pushed
the
nonmergeable
branch
from
071e96c to
2fe965e
Compare
Before we iterated key values directly for config cli values, so top level table name of config key is never tracked. And that resulted in `registries.example.credential-provider` becoming `example.credential-provider`, making `is_nonmergable_list` return false. This fix replaces the manual traversal with a direct `ConfigValue::merge` call. Now we unify how config values merge, regardless theird sources.
The root config value container isn't from any external source, so its definition should be built-in.
weihanglo
force-pushed
the
nonmergeable
branch
from
2fe965e to
9c8521d
Compare
epage
approved these changes
Nov 6, 2025
rustbot
removed
the
S-waiting-on-review
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Nov 8, 2025
Update cargo submodule 22 commits in 6368002885a04cbeae39a82cf5118f941559a40a..445fe4a68f469bf936b2fd81de2c503b233a7f4f 2025-10-31 14:31:52 +0000 to 2025-11-07 18:08:19 +0000 - fix(depinfo): prevent invalid trailing backslash on Windows (rust-lang/cargo#16223) - refactor: Remove lazycell (rust-lang/cargo#16224) - refactor: extract ConfigValue to its own module (rust-lang/cargo#16222) - fix(config): non-mergeable list from cli should take priority (rust-lang/cargo#16220) - fix(compile): build.warnings=deny shouldn't block hard warnings (rust-lang/cargo#16213) - fix: display absolute path in the `missing in PATH` warning (rust-lang/cargo#16125) - fix: non-mergeable list from config cli merge the same way (rust-lang/cargo#16219) - docs(contrib): Link out to rustc diagnostic style guide (rust-lang/cargo#16216) - fix: Remove build-plan (rust-lang/cargo#16212) - Add native completions for `--package` on various commands (rust-lang/cargo#16210) - fix(completions): don't wrap completion item help in parenthesis (rust-lang/cargo#16215) - refactor(locking): Make disabling locking on NFS mounts explicit (rust-lang/cargo#16177) - docs(unstable): Move compile-time-deps out of Stabilized section (rust-lang/cargo#16211) - docs(ref): Rename DEP_NAME_KEY to DEP_LINKS_KEY (rust-lang/cargo#16205) - feat(build-analysis): emit rebuild reason log entry (rust-lang/cargo#16203) - chore: Update dependencies (rust-lang/cargo#16200) - chore(deps): update cargo-semver-checks to v0.45.0 (rust-lang/cargo#16190) - chore(deps): update msrv (rust-lang/cargo#16178) - refactor: embed deserialize validation logic in ProgressConfig (rust-lang/cargo#16194) - refactor(gctx): extract config schema to a module (rust-lang/cargo#16195) - chore: bump to 0.94.0; update changelog (rust-lang/cargo#16191) - chore(deps): update rust crate gix to 0.74.0 (rust-lang/cargo#16186) r? ghost
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.
What does this PR try to resolve?
Before we iterated key values directly for config cli values,
so top level table name of config key is never tracked.
And that resulted in
registries.example.credential-providerbecomingexample.credential-provider,making
is_nonmergable_listreturn false.This fix replaces the manual traversal
with a direct
ConfigValue::mergecall.Now we unify how config values merge, regardless theird sources.
Fixes #16209
How to test and review this PR?
There are some slight diagnostic regressions1.
I may try addressing them once later.
Footnotes
Well, in
cli_merge_failedtest, the old one wasn't much better. It knew the failure was from--configCLI but didn't say anything about the actualinclude'd file. You need to look at the deeper cause and associate them together. ↩