fix(cargo-revendor): sort [patch.crates-io] entries deterministically (#205)#206
Open
fix(cargo-revendor): sort [patch.crates-io] entries deterministically (#205)#206
Conversation
…#205) Closes #205. The freeze step collected patched crate names into a `HashSet`, whose iteration order is randomized per-process. Every `just vendor` therefore produced a different ordering of the `[patch.crates-io]` entries in the frozen `rpkg/src/rust/Cargo.toml`, causing spurious diffs on every vendor run and frequent "Your local changes would be overwritten" failures when switching branches. Switch to `BTreeSet` so iteration is alphabetical and stable. Adds a regression test asserting alphabetical output. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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.
Closes #205.
Summary
HashSet, which randomized iteration order per process, producing different[patch.crates-io]orderings on everyjust vendor.BTreeSetso output is alphabetical and stable.Test plan
cargo test --manifest-path cargo-revendor/Cargo.toml freeze_manifestpassesjust revendor-test(full cargo-revendor suite) passesjust vendorrun twice in a row produces identicalrpkg/src/rust/Cargo.tomljust clippycleancargo clippy --workspace --all-targets --locked -- -D warningsclean (CIclippy_default)cargo clippy --workspace --all-targets --locked --features rayon,rand,...clean (CIclippy_all)just fmtjust vendor(regeneratesinst/vendor.tar.xz)Generated with Claude Code