Work with canonical URLs in [patch]
#7368
Merged
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
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
Contributor
|
This looks good to me. There are some compile errors, and rustfmt needs to be run, though. |
This commit addresses an issue with how the resolver processes `[patch]` annotations in manifests and lock files. Previously the resolver would use the raw `Url` coming out of a manifest, but the rest of resolution, when comparing `SourceId`, uses a canonical form of a `Url` rather than the actual raw `Url`. This ended up causing discrepancies like those found in rust-lang#7282. To fix the issue all `patch` intermediate storage in the resolver uses a newly-added `CanonicalUrl` type instead of a `Url`. This `CanonicalUrl` is then also used throughout the codebase, and all lookups in the resolver as switched to using `CanonicalUrl` instead of `Url`, which... Closes rust-lang#7282
1670102 to
e545412
Compare
Member
Author
|
@bors: r=ehuss oops... |
Contributor
|
📌 Commit e545412 has been approved by |
Contributor
bors
added a commit
that referenced
this pull request
Sep 17, 2019
Work with canonical URLs in `[patch]` This commit addresses an issue with how the resolver processes `[patch]` annotations in manifests and lock files. Previously the resolver would use the raw `Url` coming out of a manifest, but the rest of resolution, when comparing `SourceId`, uses a canonical form of a `Url` rather than the actual raw `Url`. This ended up causing discrepancies like those found in #7282. To fix the issue all `patch` intermediate storage in the resolver uses a newly-added `CanonicalUrl` type instead of a `Url`. This `CanonicalUrl` is then also used throughout the codebase, and all lookups in the resolver as switched to using `CanonicalUrl` instead of `Url`, which... Closes #7282
Contributor
|
☀️ Test successful - checks-azure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This commit addresses an issue with how the resolver processes
[patch]annotations in manifests and lock files. Previously the resolver would
use the raw
Urlcoming out of a manifest, but the rest of resolution,when comparing
SourceId, uses a canonical form of aUrlrather thanthe actual raw
Url. This ended up causing discrepancies like thosefound in #7282.
To fix the issue all
patchintermediate storage in the resolver uses anewly-added
CanonicalUrltype instead of aUrl. ThisCanonicalUrlis then also used throughout the codebase, and alllookups in the resolver as switched to using
CanonicalUrlinstead ofUrl, which...Closes #7282