Use filename trait for WheelWire conversion
#3651
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
charliermarsh
commented
May 18, 2024
| .ok_or_else(|| Error::MissingPathSegments)?; | ||
|
|
||
| // This is guaranteed by the contract of `Url::path_segments`. | ||
| let last = path_segments.last().expect("path segments is non-empty"); |
There was a problem hiding this comment.
Ported this over from your version in lock.rs.
charliermarsh
commented
May 18, 2024
| #[error("Unable to extract file path from URL: {0}")] | ||
| MissingFilePath(Url), | ||
|
|
||
| #[error("Could not extract path segments")] |
There was a problem hiding this comment.
Weird that this omits the URL, but MissingFilePath includes it, because the clients of these errors sometimes include the URL and sometimes don't. Specifically, where we return MissingFilePath, we need to include the URL; but where we return MissingPathSegments, we want to exclude it, because we wrap it in a message that includes the URL (so including it here would duplicate it). I don't know what the right strategy is.
There was a problem hiding this comment.
Okay, changed these to both include the URL, and removed the "wrap the error in failed to extract filename from URL" behavior from lock.rs.
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.
Summary
The main motivation here is that the
.filename()method that we implement onUrlwill do URL decoding for the last segment, which we were missing here.The errors are a bit awkward, because in
crates/uv-resolver/src/lock.rs, we wrap infailed to extract filename from URL: {url}, so in theory we want the underlying errors to omit the URL? But sometimes they use#[error(transparent)]?