Use CanonicalUrl

astral-sh · Mar 22, 2024 · d9cd56c · d9cd56c
1 parent a281951
commit d9cd56c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/distribution-types/src/index_url.rs b/crates/distribution-types/src/index_url.rs
@@ -28,7 +28,7 @@ pub enum IndexUrl {
 
 impl IndexUrl {
     /// Return the raw URL for the index.
-    pub(crate) fn url(&self) -> &Url {
+    pub fn url(&self) -> &Url {
         match self {
             Self::Pypi(url) => url.raw(),
             Self::Url(url) => url.raw(),

diff --git a/crates/uv-requirements/Cargo.toml b/crates/uv-requirements/Cargo.toml
@@ -10,6 +10,7 @@ authors.workspace = true
 license.workspace = true
 
 [dependencies]
+cache-key = { workspace = true }
 distribution-filename = { workspace = true }
 distribution-types = { workspace = true }
 pep508_rs = { workspace = true }

diff --git a/crates/uv-requirements/src/specification.rs b/crates/uv-requirements/src/specification.rs
@@ -5,7 +5,7 @@ use indexmap::IndexMap;
 use rustc_hash::FxHashSet;
 use tracing::{instrument, Level};
 
-use crate::{ExtrasSpecification, RequirementsSource};
+use cache_key::CanonicalUrl;
 use distribution_types::{FlatIndexLocation, IndexUrl};
 use pep508_rs::{Requirement, RequirementsTxtRequirement};
 use requirements_txt::{EditableRequirement, FindLink, RequirementsTxt};
@@ -14,6 +14,8 @@ use uv_fs::Simplified;
 use uv_normalize::{ExtraName, PackageName};
 use uv_warnings::warn_user;
 
+use crate::{ExtrasSpecification, RequirementsSource};
+
 #[derive(Debug, Default)]
 pub struct RequirementsSpecification {
     /// The name of the project specifying requirements.
@@ -205,15 +207,15 @@ impl RequirementsSpecification {
                 spec.project = source.project;
             }
 
-            if let Some(url) = source.index_url {
+            if let Some(index_url) = source.index_url {
                 if let Some(existing) = spec.index_url {
-                    if url != existing {
+                    if CanonicalUrl::new(index_url.url()) != CanonicalUrl::new(existing.url()) {
                         return Err(anyhow::anyhow!(
-                            "Multiple index URLs specified: `{existing}` vs. `{url}`",
+                            "Multiple index URLs specified: `{existing}` vs. `{index_url}`",
                         ));
                     }
                 }
-                spec.index_url = Some(url);
+                spec.index_url = Some(index_url);
             }
             spec.no_index |= source.no_index;
             spec.extra_index_urls.extend(source.extra_index_urls);
@@ -238,15 +240,15 @@ impl RequirementsSpecification {
             spec.constraints.extend(source.constraints);
             spec.constraints.extend(source.overrides);
 
-            if let Some(url) = source.index_url {
+            if let Some(index_url) = source.index_url {
                 if let Some(existing) = spec.index_url {
-                    if url != existing {
+                    if CanonicalUrl::new(index_url.url()) != CanonicalUrl::new(existing.url()) {
                         return Err(anyhow::anyhow!(
-                            "Multiple index URLs specified: `{existing}` vs. `{url}`",
+                            "Multiple index URLs specified: `{existing}` vs. `{index_url}`",
                         ));
                     }
                 }
-                spec.index_url = Some(url);
+                spec.index_url = Some(index_url);
             }
             spec.no_index |= source.no_index;
             spec.extra_index_urls.extend(source.extra_index_urls);
@@ -271,15 +273,15 @@ impl RequirementsSpecification {
             spec.overrides.extend(source.constraints);
             spec.overrides.extend(source.overrides);
 
-            if let Some(url) = source.index_url {
+            if let Some(index_url) = source.index_url {
                 if let Some(existing) = spec.index_url {
-                    if url != existing {
+                    if CanonicalUrl::new(index_url.url()) != CanonicalUrl::new(existing.url()) {
                         return Err(anyhow::anyhow!(
-                            "Multiple index URLs specified: `{existing}` vs. `{url}`",
+                            "Multiple index URLs specified: `{existing}` vs. `{index_url}`",
                         ));
                     }
                 }
-                spec.index_url = Some(url);
+                spec.index_url = Some(index_url);
             }
             spec.no_index |= source.no_index;
             spec.extra_index_urls.extend(source.extra_index_urls);