fix(lockfile): switch to resolver.lockfile-path config
#16510
Merged
+209
−951
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
Collaborator
rustbot
added
A-cli
epage
reviewed
Jan 15, 2026
| } | ||
|
|
||
| #[cargo_test] | ||
| fn config_lockfile_path() { |
Contributor
There was a problem hiding this comment.
nit: for cases like this, I'd make the tests use the flag and have the feature commit switch to config
(likely not worth it at this point)
Member
Author
There was a problem hiding this comment.
Did it in the other way then found I misunderstood your suggestion 😅.
Contributor
There was a problem hiding this comment.
I meant --lockfile-path then switch to the config so that we can show that the behavior remains the same independent of the mechanism.
Like I said, likely not worth it atm
epage
approved these changes
Jan 15, 2026
Contributor
|
Thanks! |
7 tasks
rustbot
removed
the
S-waiting-on-review
rust-bors bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Jan 16, 2026
Update cargo submodule 15 commits in 8c133afcd5e0d69932fe11f5907683723f8d361d..85eff7c80277b57f78b11e28d14154ab12fcf643 2026-01-09 03:50:15 +0000 to 2026-01-15 16:18:08 +0000 - fix(lockfile): switch to `resolver.lockfile-path` config (rust-lang/cargo#16510) - Moved build-script bins to `deps` directory (rust-lang/cargo#16515) - Invalidate the whole build cache when `-Zno-embed-metadata` changes (rust-lang/cargo#16513) - Do not create examples dir in build dir with new layout (rust-lang/cargo#16514) - fix(git): avoid partial oid got zero padded (rust-lang/cargo#16511) - Optimize cargo locate-project --workspace (rust-lang/cargo#16423) - chore: Update typos (rust-lang/cargo#16507) - refactor(git): remove unnecessary serialization (rust-lang/cargo#16505) - fix(build-std): std link metadata propagate to user (rust-lang/cargo#16496) - Improve error message for missing dependencies (rust-lang/cargo#16500) - fix: preserve `dep_name` for build script metadata (rust-lang/cargo#16494) - refactor(toml): clarify `to_dependency` for config patch (rust-lang/cargo#16492) - Add `--id` flag to `cargo report timings` and `cargo report rebuilds` (rust-lang/cargo#16490) - Display lockfile path in very verbose mode when blocking (rust-lang/cargo#16491) - fix(info): resolve underscore vs hyphen mismatch in schema lookup (rust-lang/cargo#16455) 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?
Fixes #15510
--lockfile-pathin 1.95.0-nightly (if this gets into 1.94.0-nightly)Part of #14421
How to test and review this PR?