Make DisplaySafeUrlRef Copy and other minor PR follow-ups (#13683)

This PR implements a few review follow-ups from #13560. In particular,
it
* Makes `DisplaySafeUrlRef` implement `Copy` so that it can be passed by
value.
* Updates `to_string_with_credentials` methods with
`displayable_with_credentials`, returning an `impl Display` instead of
`String` for greater flexibility.
* Updates the `DisplaySafeUrl` and `DisplaySafeUrlRef` `Debug`
implementations to match the underlying `Url` `Debug` implementation
(with the exception that credentials are masked).
* Replaces an unnecessary `DisplaySafeUrl::from(Url::from_file_path`
with `DisplaySafeUrl::from_file_path`

Author: jtfmumm

crates/uv-auth/src/credentials.rs

@@ -145,7 +145,7 @@ impl Credentials {
     /// If a username is provided, it must match the login in the netrc file or [`None`] is returned.
     pub(crate) fn from_netrc(
         netrc: &Netrc,
-        url: &DisplaySafeUrlRef<'_>,
+        url: DisplaySafeUrlRef<'_>,
         username: Option<&str>,
     ) -> Option<Self> {
         let host = url.host_str()?;

crates/uv-auth/src/keyring.rs

@@ -38,7 +38,7 @@ impl KeyringProvider {
     #[instrument(skip_all, fields(url = % url.to_string(), username))]
     pub async fn fetch(
         &self,
-        url: &DisplaySafeUrlRef<'_>,
+        url: DisplaySafeUrlRef<'_>,
         username: Option<&str>,
     ) -> Option<Credentials> {
         // Validate the request
@@ -229,7 +229,7 @@ mod tests {
         let keyring = KeyringProvider::empty();
         // Panics due to debug assertion; returns `None` in production
         let result = std::panic::AssertUnwindSafe(
-            keyring.fetch(&DisplaySafeUrlRef::from(&url), Some("user")),
+            keyring.fetch(DisplaySafeUrlRef::from(&url), Some("user")),
         )
         .catch_unwind()
         .await;
@@ -242,7 +242,7 @@ mod tests {
         let keyring = KeyringProvider::empty();
         // Panics due to debug assertion; returns `None` in production
         let result = std::panic::AssertUnwindSafe(
-            keyring.fetch(&DisplaySafeUrlRef::from(&url), Some(url.username())),
+            keyring.fetch(DisplaySafeUrlRef::from(&url), Some(url.username())),
         )
         .catch_unwind()
         .await;
@@ -255,7 +255,7 @@ mod tests {
         let keyring = KeyringProvider::empty();
         // Panics due to debug assertion; returns `None` in production
         let result = std::panic::AssertUnwindSafe(
-            keyring.fetch(&DisplaySafeUrlRef::from(&url), Some(url.username())),
+            keyring.fetch(DisplaySafeUrlRef::from(&url), Some(url.username())),
         )
         .catch_unwind()
         .await;
@@ -267,7 +267,7 @@ mod tests {
         let url = Url::parse("https://example.com").unwrap();
         let url = DisplaySafeUrlRef::from(&url);
         let keyring = KeyringProvider::empty();
-        let credentials = keyring.fetch(&url, Some("user"));
+        let credentials = keyring.fetch(url, Some("user"));
         assert!(credentials.await.is_none());
     }
 
@@ -277,7 +277,7 @@ mod tests {
         let keyring = KeyringProvider::dummy([(url.host_str().unwrap(), "user", "password")]);
         assert_eq!(
             keyring
-                .fetch(&DisplaySafeUrlRef::from(&url), Some("user"))
+                .fetch(DisplaySafeUrlRef::from(&url), Some("user"))
                 .await,
             Some(Credentials::basic(
                 Some("user".to_string()),
@@ -287,7 +287,7 @@ mod tests {
         assert_eq!(
             keyring
                 .fetch(
-                    &DisplaySafeUrlRef::from(&url.join("test").unwrap()),
+                    DisplaySafeUrlRef::from(&url.join("test").unwrap()),
                     Some("user")
                 )
                 .await,
@@ -303,7 +303,7 @@ mod tests {
         let url = Url::parse("https://example.com").unwrap();
         let keyring = KeyringProvider::dummy([("other.com", "user", "password")]);
         let credentials = keyring
-            .fetch(&DisplaySafeUrlRef::from(&url), Some("user"))
+            .fetch(DisplaySafeUrlRef::from(&url), Some("user"))
             .await;
         assert_eq!(credentials, None);
     }
@@ -318,7 +318,7 @@ mod tests {
         assert_eq!(
             keyring
                 .fetch(
-                    &DisplaySafeUrlRef::from(&url.join("foo").unwrap()),
+                    DisplaySafeUrlRef::from(&url.join("foo").unwrap()),
                     Some("user")
                 )
                 .await,
@@ -329,7 +329,7 @@ mod tests {
         );
         assert_eq!(
             keyring
-                .fetch(&DisplaySafeUrlRef::from(&url), Some("user"))
+                .fetch(DisplaySafeUrlRef::from(&url), Some("user"))
                 .await,
             Some(Credentials::basic(
                 Some("user".to_string()),
@@ -339,7 +339,7 @@ mod tests {
         assert_eq!(
             keyring
                 .fetch(
-                    &DisplaySafeUrlRef::from(&url.join("bar").unwrap()),
+                    DisplaySafeUrlRef::from(&url.join("bar").unwrap()),
                     Some("user")
                 )
                 .await,
@@ -355,7 +355,7 @@ mod tests {
         let url = Url::parse("https://example.com").unwrap();
         let keyring = KeyringProvider::dummy([(url.host_str().unwrap(), "user", "password")]);
         let credentials = keyring
-            .fetch(&DisplaySafeUrlRef::from(&url), Some("user"))
+            .fetch(DisplaySafeUrlRef::from(&url), Some("user"))
             .await;
         assert_eq!(
             credentials,
@@ -370,7 +370,7 @@ mod tests {
     async fn fetch_url_no_username() {
         let url = Url::parse("https://example.com").unwrap();
         let keyring = KeyringProvider::dummy([(url.host_str().unwrap(), "user", "password")]);
-        let credentials = keyring.fetch(&DisplaySafeUrlRef::from(&url), None).await;
+        let credentials = keyring.fetch(DisplaySafeUrlRef::from(&url), None).await;
         assert_eq!(
             credentials,
             Some(Credentials::basic(
@@ -385,14 +385,14 @@ mod tests {
         let url = Url::parse("https://example.com").unwrap();
         let keyring = KeyringProvider::dummy([(url.host_str().unwrap(), "foo", "password")]);
         let credentials = keyring
-            .fetch(&DisplaySafeUrlRef::from(&url), Some("bar"))
+            .fetch(DisplaySafeUrlRef::from(&url), Some("bar"))
             .await;
         assert_eq!(credentials, None);
 
         // Still fails if we have `foo` in the URL itself
         let url = Url::parse("https://[email protected]").unwrap();
         let credentials = keyring
-            .fetch(&DisplaySafeUrlRef::from(&url), Some("bar"))
+            .fetch(DisplaySafeUrlRef::from(&url), Some("bar"))
             .await;
         assert_eq!(credentials, None);
     }

crates/uv-auth/src/middleware.rs

@@ -508,7 +508,7 @@ impl AuthMiddleware {
             debug!("Checking netrc for credentials for {url}");
             Credentials::from_netrc(
                 netrc,
-                &url,
+                url,
                 credentials
                     .as_ref()
                     .and_then(|credentials| credentials.username()),
@@ -529,17 +529,17 @@ impl AuthMiddleware {
                 if let Some(username) = credentials.and_then(|credentials| credentials.username()) {
                     if let Some(index_url) = maybe_index_url {
                         debug!("Checking keyring for credentials for index URL {}@{}", username, index_url);
-                        keyring.fetch(&DisplaySafeUrlRef::from(index_url), Some(username)).await
+                        keyring.fetch(DisplaySafeUrlRef::from(index_url), Some(username)).await
                     } else {
                         debug!("Checking keyring for credentials for full URL {}@{}", username, url);
-                        keyring.fetch(&url, Some(username)).await
+                        keyring.fetch(url, Some(username)).await
                     }
                 } else if matches!(auth_policy, AuthPolicy::Always) {
                     if let Some(index_url) = maybe_index_url {
                         debug!(
                             "Checking keyring for credentials for index URL {index_url} without username due to `authenticate = always`"
                         );
-                        keyring.fetch(&DisplaySafeUrlRef::from(index_url), None).await
+                        keyring.fetch(DisplaySafeUrlRef::from(index_url), None).await
                     } else {
                         None
                     }