Avoid colliding with older Cargo fingerprint changes #8473
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
The fingerprint format Cargo stores changed recently in a way that older Cargos cannot understand. Unfortunately though older Cargos are colliding on some compilation units trying to read the new format and they're bailing out. This commit fixes this issue by ensuring that the location for fingerprint metadata is different in older Cargos and newer Cargos. Fingerprint metadata is always stored in a location with a hash in the file name. This hash typically includes the hash of rustc's version information itself, but for units which don't have a `Metadata` it's a much simpler hash which is much more likely to collide with other versions of Cargo. The fix in this commit is to extract the metadata version that we're hashing to a constant, and then also hash it for generating a filesystem location to house fingerprint data for a unit that has no `Metadata`. Closes rust-lang#8472
|
r? @Eh2406 (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @ehuss |
|
Thanks! |
|
📌 Commit 15d4960 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Jul 14, 2020
Update cargo 4 commits in 4f74d9b2a771c58b7ef4906b2668afd075bc8081..43cf77395cad5b79887b20b7cf19d418bbd703a9 2020-07-08 17:13:00 +0000 to 2020-07-13 17:35:42 +0000 - fix: add space to comments (rust-lang/cargo#8476) - Allow configuring unstable flags via config file (rust-lang/cargo#8393) - Add support for rustc's `-Z terminal-width`. (rust-lang/cargo#8427) - Avoid colliding with older Cargo fingerprint changes (rust-lang/cargo#8473)
ehuss
pushed a commit
to ehuss/cargo
that referenced
this pull request
Jul 15, 2020
Avoid colliding with older Cargo fingerprint changes The fingerprint format Cargo stores changed recently in a way that older Cargos cannot understand. Unfortunately though older Cargos are colliding on some compilation units trying to read the new format and they're bailing out. This commit fixes this issue by ensuring that the location for fingerprint metadata is different in older Cargos and newer Cargos. Fingerprint metadata is always stored in a location with a hash in the file name. This hash typically includes the hash of rustc's version information itself, but for units which don't have a `Metadata` it's a much simpler hash which is much more likely to collide with other versions of Cargo. The fix in this commit is to extract the metadata version that we're hashing to a constant, and then also hash it for generating a filesystem location to house fingerprint data for a unit that has no `Metadata`. Closes rust-lang#8472 Closes rust-lang#8298
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 fingerprint format Cargo stores changed recently in a way that
older Cargos cannot understand. Unfortunately though older Cargos are
colliding on some compilation units trying to read the new format and
they're bailing out. This commit fixes this issue by ensuring that the
location for fingerprint metadata is different in older Cargos and newer
Cargos.
Fingerprint metadata is always stored in a location with a hash in the
file name. This hash typically includes the hash of rustc's version
information itself, but for units which don't have a
Metadatait's amuch simpler hash which is much more likely to collide with other
versions of Cargo. The fix in this commit is to extract the metadata
version that we're hashing to a constant, and then also hash it for
generating a filesystem location to house fingerprint data for a unit
that has no
Metadata.Closes #8472
Closes #8298