Fix broken relative paths

astral-sh · Feb 16, 2024 · 829a1ed · 829a1ed
1 parent 418d9ca
commit 829a1ed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/crates/pypi-types/src/base_url.rs b/crates/pypi-types/src/base_url.rs
@@ -13,16 +13,19 @@ pub fn base_url_join_relative(base: &str, maybe_relative: &str) -> Result<Url, J
         Ok(absolute) => Ok(absolute),
         Err(err) => {
             if err == url::ParseError::RelativeUrlWithoutBase {
-                let base = Url::parse(base).map_err(|err| JoinRelativeError {
+                let base_url = Url::parse(base).map_err(|err| JoinRelativeError::ParseError {
                     original: base.to_string(),
                     source: err,
                 })?;
-                base.join(maybe_relative).map_err(|err| JoinRelativeError {
-                    original: format!("{base}/{maybe_relative}"),
-                    source: err,
-                })
+
+                base_url
+                    .join(maybe_relative)
+                    .map_err(|_| JoinRelativeError::ParseError {
+                        original: format!("{base}/{maybe_relative}"),
+                        source: err,
+                    })
             } else {
-                Err(JoinRelativeError {
+                Err(JoinRelativeError::ParseError {
                     original: maybe_relative.to_string(),
                     source: err,
                 })
@@ -36,10 +39,12 @@ pub fn base_url_join_relative(base: &str, maybe_relative: &str) -> Result<Url, J
 /// The error message includes the URL (`base` or `maybe_relative`) passed to
 /// `base_url_join_relative` that provoked the error.
 #[derive(Clone, Debug, thiserror::Error)]
-#[error("Failed to parse URL: `{original}`")]
-pub struct JoinRelativeError {
-    original: String,
-    source: url::ParseError,
+pub enum JoinRelativeError {
+    #[error("Failed to parse URL: `{original}`")]
+    ParseError {
+        original: String,
+        source: url::ParseError,
+    },
 }
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]

diff --git a/crates/uv-client/src/registry_client.rs b/crates/uv-client/src/registry_client.rs
@@ -189,7 +189,10 @@ impl RegistryClient {
         url.path_segments_mut()
             .unwrap()
             .pop_if_empty()
-            .push(package_name.as_ref());
+            .push(package_name.as_ref())
+            // The URL *must* end in a trailing slash for proper relative path behavior
+            // ref https://github.com/servo/rust-url/issues/333
+            .push("");
 
         trace!("Fetching metadata for {package_name} from {url}");