[beta] Avoid colliding with older Cargo fingerprint changes #8488
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
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
|
r? @Eh2406 (rust_highfive has picked a reviewer for you, use r? to override) |
|
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit c810ed0 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit c810ed0 with merge 10fcbaa43aa385625c6e3b0aac6d05be78b40dc7... |
|
I think bors is listening to github actions now so I'm going to merge manually. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 23, 2020
…acrum [beta] Update cargo 2 commits in 4f74d9b2a771c58b7ef4906b2668afd075bc8081..149022b1d8f382e69c1616f6a46b69ebf59e2dea 2020-07-08 17:13:00 +0000 to 2020-07-17 16:39:39 -0400 - [beta] Revert "Improve support for non-`master` main branches" (rust-lang/cargo#8503) - [beta] Avoid colliding with older Cargo fingerprint changes (rust-lang/cargo#8488)
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.
Beta backport of #8473.
The breaking change was introduced in 1.46, so I'd like to avoid it hitting stable.