From 72af449638645247c86a302778435f8595025167 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Thu, 10 Sep 2026 18:18:34 -0500 Subject: [PATCH] Format `UnnamedRequirement` extras directly --- crates/uv-pep508/src/lib.rs | 32 ++++++++++++++++++++++++++++++++ crates/uv-pep508/src/unnamed.rs | 12 +++--------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/crates/uv-pep508/src/lib.rs b/crates/uv-pep508/src/lib.rs index c6ddb731792..42367422b05 100644 --- a/crates/uv-pep508/src/lib.rs +++ b/crates/uv-pep508/src/lib.rs @@ -1276,6 +1276,38 @@ mod tests { assert_eq!(*numpy.extras, [ExtraName::from_str("dev").unwrap()]); } + #[test] + #[cfg(feature = "non-pep508-extensions")] + fn direct_url_display() -> Result<(), Box> { + const URL: &str = "https://example.invalid/archive.whl?raw=%23#fragment"; + let mut requirement = crate::UnnamedRequirement::::from_str(URL)?; + let cases: &[(&[&str], &str)] = &[ + (&[], ""), + (&["dev"], "[dev]"), + (&["z", "a", "z"], "[z,a,z]"), + (&["B", "a_b", "B", "a.b"], "[b,a-b,b,a-b]"), + ]; + for (extras, suffix) in cases { + requirement.extras = extras + .iter() + .map(|name| ExtraName::from_str(name)) + .collect::, _>>()? + .into_boxed_slice(); + let expected = format!("{URL}{suffix}"); + assert_eq!(requirement.to_string(), expected); + assert_eq!(requirement.to_string(), expected); + } + + let requirement = crate::UnnamedRequirement::::from_str( + "https://user:fake-token@example.invalid/archive.whl?raw=%23#fragment[z,a,z] ; python_full_version >= '3.12'", + )?; + assert_eq!( + requirement.to_string(), + "https://user:****@example.invalid/archive.whl?raw=%23#fragment[z,a,z] ; python_full_version >= '3.12'" + ); + Ok(()) + } + #[test] fn error_extras_eof1() { assert_snapshot!( diff --git a/crates/uv-pep508/src/unnamed.rs b/crates/uv-pep508/src/unnamed.rs index cba933815ef..7bf1398140f 100644 --- a/crates/uv-pep508/src/unnamed.rs +++ b/crates/uv-pep508/src/unnamed.rs @@ -3,6 +3,8 @@ use std::hash::Hash; use std::path::Path; use std::str::FromStr; +use itertools::Itertools; + use uv_fs::normalize_url_path; use uv_normalize::ExtraName; @@ -129,15 +131,7 @@ impl Display for UnnamedRequirement { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "{}", self.url)?; if !self.extras.is_empty() { - write!( - f, - "[{}]", - self.extras - .iter() - .map(ToString::to_string) - .collect::>() - .join(",") - )?; + write!(f, "[{}]", self.extras.iter().format(","))?; } if let Some(marker) = self.marker.contents() { write!(f, " ; {marker}")?;