Normalize SourceID in cargo metadata.
#8824
Merged
Conversation
This file contains 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors: r+ Thanks for fixing this! And sorry I didn't get a chance to get around to this :( |
|
📌 Commit d88ed1c has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
m-ou-se
added a commit
to m-ou-se/rust
that referenced
this pull request
Nov 5, 2020
Update cargo 7 commits in becb4c282b8f37469efb8f5beda45a5501f9d367..d5556aeb8405b1fe696adb6e297ad7a1f2989b62 2020-10-28 16:41:55 +0000 to 2020-11-04 22:20:36 +0000 - Implement weak dependency features. (rust-lang/cargo#8818) - Avoid some extra downloads with new feature resolver. (rust-lang/cargo#8823) - fix: remove install command `$`, for copying friendly (rust-lang/cargo#8828) - Bump `anyhow` dependency to `1.0.34` in `crates-io` crate (rust-lang/cargo#8826) - Normalize SourceID in `cargo metadata`. (rust-lang/cargo#8824) - vendor: correct the path to cargo config (rust-lang/cargo#8822) - Make host_root return host.root(), not host.dest() (rust-lang/cargo#8819)
m-ou-se
added a commit
to m-ou-se/rust
that referenced
this pull request
Nov 5, 2020
Update cargo 7 commits in becb4c282b8f37469efb8f5beda45a5501f9d367..d5556aeb8405b1fe696adb6e297ad7a1f2989b62 2020-10-28 16:41:55 +0000 to 2020-11-04 22:20:36 +0000 - Implement weak dependency features. (rust-lang/cargo#8818) - Avoid some extra downloads with new feature resolver. (rust-lang/cargo#8823) - fix: remove install command `$`, for copying friendly (rust-lang/cargo#8828) - Bump `anyhow` dependency to `1.0.34` in `crates-io` crate (rust-lang/cargo#8826) - Normalize SourceID in `cargo metadata`. (rust-lang/cargo#8824) - vendor: correct the path to cargo config (rust-lang/cargo#8822) - Make host_root return host.root(), not host.dest() (rust-lang/cargo#8819)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The SourceID in
cargo metadatacan have different values, but they can be equivalent in Cargo. This results in different serialized forms, which prevents comparing the ID strings. In this particular case,SourceKind::Git(GitReference::Branch("master"))is equivalent toSourceKind::Git(GitReference::DefaultBranch), but they serialize differently.The reason these end up differently is because the
SourceIdfor aPackageis created from theDependencydeclaration. But theSourceIdinCargo.lockcomes from the deserialized file. If you have an explicitbranch = "master"in the dependency, then versions prior to 1.47 would not include?branch=masterinCargo.lock. However, since 1.47, internally Cargo will useGitReference::Branch("master").Conversely, if you have a new
Cargo.lock(with?branch=master), and then remove the explicitbranch="master"fromCargo.toml, you'll end up with another mismatch incargo metadata.The solution here is to use the variant from the
Packagewhen serializing the resolver incargo metadata. I chose this since thePackagevariant is displayed on other JSON messages (like artifact messages), and I think this is the only place that the resolver variants are exposed (other thanCargo.lockitself).I'm not convinced that this was entirely intended, since there is code to avoid this, and at the time #8522 landed, I did not realize this would change the V2 lock format. However, it's probably too late to try to reverse that, and I don't think there are any other problems other than this
cargo metadatainconsistency.Fixes #8756