Bump MSRV to 1.84 (#12670)

## Summary

Closes #12649.

Author: charliermarsh

Cargo.toml

@@ -12,7 +12,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.83"
+rust-version = "1.84"
 homepage = "https://pypi.org/project/uv/"
 documentation = "https://pypi.org/project/uv/"
 repository = "https://github.com/astral-sh/uv"

crates/uv-auth/src/credentials.rs

@@ -131,7 +131,7 @@ impl Credentials {
         // Ensure the username matches if provided
         if username.is_some_and(|username| username != entry.login) {
             return None;
-        };
+        }
 
         Some(Credentials::Basic {
             username: Username::new(Some(entry.login.clone())),

crates/uv-auth/src/middleware.rs

@@ -361,7 +361,7 @@ impl AuthMiddleware {
         {
             trace!("Updating cached credentials for {url} to {credentials:?}");
             self.cache().insert(&url, credentials);
-        };
+        }
 
         result
     }
@@ -449,7 +449,7 @@ impl AuthMiddleware {
                 trace!("Using credentials from previous fetch for {url}");
             } else {
                 trace!("Skipping fetch of credentials for {url}, previous attempt failed");
-            };
+            }
 
             return credentials;
         }
@@ -513,14 +513,14 @@ fn tracing_url(request: &Request, credentials: Option<&Credentials>) -> String {
             .and_then(|credentials| credentials.username())
         {
             let _ = url.set_username(username);
-        };
+        }
         if credentials
             .as_ref()
             .and_then(|credentials| credentials.password())
             .is_some()
         {
             let _ = url.set_password(Some("****"));
-        };
+        }
         url.to_string()
     } else {
         request.url().to_string()

crates/uv-build-backend/src/metadata.rs

@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, Bound};
 use std::ffi::OsStr;
 use std::fmt::Display;
+use std::fmt::Write;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
@@ -603,7 +604,7 @@ impl PyProjectToml {
             return Err(ValidationError::InvalidGroup(group.to_string()));
         }
 
-        writer.push_str(&format!("[{group}]\n"));
+        let _ = writeln!(writer, "[{group}]");
         for (name, object_reference) in entries {
             // More strict than the spec, we enforce the recommendation
             if !name
@@ -614,7 +615,7 @@ impl PyProjectToml {
             }
 
             // TODO(konsti): Validate that the object references are valid Python identifiers.
-            writer.push_str(&format!("{name} = {object_reference}\n"));
+            let _ = writeln!(writer, "{name} = {object_reference}");
         }
         writer.push('\n');
         Ok(())
@@ -963,7 +964,7 @@ mod tests {
     fn format_err(err: impl std::error::Error) -> String {
         let mut formatted = err.to_string();
         for source in iter::successors(err.source(), |&err| err.source()) {
-            formatted += &format!("\n  Caused by: {source}");
+            let _ = write!(formatted, "\n  Caused by: {source}");
         }
         formatted
     }

crates/uv-build-backend/src/source_dist.rs

@@ -231,7 +231,7 @@ fn write_source_dist(
         if !include_matcher.match_path(relative) || exclude_matcher.is_match(relative) {
             trace!("Excluding: `{}`", relative.user_display());
             continue;
-        };
+        }
 
         debug!("Including {}", relative.user_display());
         if entry.file_type().is_dir() {

crates/uv-build-backend/src/wheel.rs

@@ -560,7 +560,7 @@ fn wheel_subdir_from_globs(
         if !matcher.match_path(relative) {
             trace!("Excluding {}: `{}`", globs_field, relative.user_display());
             continue;
-        };
+        }
 
         let relative_licenses = Path::new(target)
             .join(relative)

crates/uv-build-frontend/src/lib.rs

@@ -568,7 +568,7 @@ impl SourceBuild {
                                 nor `setup.cfg` are present in the directory",
                                 source_tree.simplified_display().cyan(),
                             );
-                        };
+                        }
                     }
                     default_backend.clone()
                 };

crates/uv-client/src/base_client.rs

@@ -1,18 +1,21 @@
+use std::error::Error;
+use std::fmt::Debug;
+use std::fmt::Write;
+use std::path::Path;
+use std::sync::Arc;
+use std::time::Duration;
+use std::{env, iter};
+
 use itertools::Itertools;
 use reqwest::{Client, ClientBuilder, Proxy, Response};
 use reqwest_middleware::{ClientWithMiddleware, Middleware};
 use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_retry::{
     DefaultRetryableStrategy, RetryTransientMiddleware, Retryable, RetryableStrategy,
 };
-use std::error::Error;
-use std::fmt::Debug;
-use std::path::Path;
-use std::sync::Arc;
-use std::time::Duration;
-use std::{env, iter};
 use tracing::{debug, trace};
 use url::Url;
+
 use uv_auth::{AuthMiddleware, UrlAuthPolicies};
 use uv_configuration::{KeyringProviderType, TrustedHost};
 use uv_fs::Simplified;
@@ -186,7 +189,7 @@ impl<'a> BaseClientBuilder<'a> {
         if let Some(markers) = self.markers {
             let linehaul = LineHaul::new(markers, self.platform);
             if let Ok(output) = serde_json::to_string(&linehaul) {
-                user_agent_string += &format!(" {output}");
+                let _ = write!(user_agent_string, " {output}");
             }
         }
 

crates/uv-client/src/html.rs

@@ -130,7 +130,7 @@ impl SimpleHtml {
         // the final path component of the URL.
         let filename = path
             .split('/')
-            .last()
+            .next_back()
             .ok_or_else(|| Error::MissingFilename(href.to_string()))?;
 
         // Strip any query string from the filename.

crates/uv-client/src/httpcache/control.rs

@@ -415,9 +415,8 @@ impl<'b, B: 'b + ?Sized + AsRef<[u8]>, I: Iterator<Item = &'b B>> Iterator
                 self.skip_whitespace();
                 self.maybe_parse_directive_delimiter();
                 let directive = CacheControlDirective { name, value };
-                match self.emit_directive(directive) {
-                    None => continue,
-                    Some(d) => return Some(d),
+                if let Some(d) = self.emit_directive(directive) {
+                    return Some(d);
                 }
             }
         }