Upgrade to Rust 1.83

Author: charliermarsh

Cargo.toml

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

crates/uv-cache/src/wheel.rs

@@ -23,7 +23,7 @@ pub enum WheelCache<'a> {
     Git(&'a Url, &'a str),
 }
 
-impl<'a> WheelCache<'a> {
+impl WheelCache<'_> {
     /// The root directory for a cache bucket.
     pub fn root(&self) -> PathBuf {
         match self {

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

@@ -992,6 +992,7 @@ impl ArchivedCachePolicy {
 /// This dictates what the caller should do next by indicating whether the
 /// cached response is stale or not.
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum BeforeRequest {
     /// The cached response is still fresh, and the caller may return the
     /// cached response without issuing an HTTP requests.

crates/uv-client/src/remote_metadata.rs

@@ -85,7 +85,7 @@ pub(crate) async fn wheel_metadata_from_remote_zip(
     // The zip archive uses as BufReader which reads in chunks of 8192. To ensure we prefetch
     // enough data we round the size up to the nearest multiple of the buffer size.
     let buffer_size = 8192;
-    let size = ((size + buffer_size - 1) / buffer_size) * buffer_size;
+    let size = size.div_ceil(buffer_size) * buffer_size;
 
     // Fetch the bytes from the zip archive that contain the requested file.
     reader

crates/uv-configuration/src/name_specifiers.rs

@@ -31,7 +31,7 @@ impl<'de> serde::Deserialize<'de> for PackageNameSpecifier {
     {
         struct Visitor;
 
-        impl<'de> serde::de::Visitor<'de> for Visitor {
+        impl serde::de::Visitor<'_> for Visitor {
             type Value = PackageNameSpecifier;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {

crates/uv-distribution-types/src/buildable.rs

@@ -92,7 +92,7 @@ pub enum SourceUrl<'a> {
     Directory(DirectorySourceUrl<'a>),
 }
 
-impl<'a> SourceUrl<'a> {
+impl SourceUrl<'_> {
     /// Return the [`Url`] of the source.
     pub fn url(&self) -> &Url {
         match self {

crates/uv-distribution-types/src/hash.rs

@@ -11,7 +11,7 @@ pub enum HashPolicy<'a> {
     Validate(&'a [HashDigest]),
 }
 
-impl<'a> HashPolicy<'a> {
+impl HashPolicy<'_> {
     /// Returns `true` if the hash policy is `None`.
     pub fn is_none(&self) -> bool {
         matches!(self, Self::None)

crates/uv-distribution-types/src/lib.rs

@@ -101,7 +101,7 @@ pub enum VersionOrUrlRef<'a, T: Pep508Url = VerbatimUrl> {
     Url(&'a T),
 }
 
-impl<'a, T: Pep508Url> VersionOrUrlRef<'a, T> {
+impl<T: Pep508Url> VersionOrUrlRef<'_, T> {
     /// If it is a URL, return its value.
     pub fn url(&self) -> Option<&T> {
         match self {
@@ -138,7 +138,7 @@ pub enum InstalledVersion<'a> {
     Url(&'a Url, &'a Version),
 }
 
-impl<'a> InstalledVersion<'a> {
+impl InstalledVersion<'_> {
     /// If it is a URL, return its value.
     pub fn url(&self) -> Option<&Url> {
         match self {

crates/uv-distribution/src/metadata/lowering.rs

@@ -84,7 +84,7 @@ impl LoweredRequirement {
         if workspace.packages().contains_key(&requirement.name) {
             // And it's not a recursive self-inclusion (extras that activate other extras), e.g.
             // `framework[machine_learning]` depends on `framework[cuda]`.
-            if !project_name.is_some_and(|project_name| *project_name == requirement.name) {
+            if project_name.is_none_or(|project_name| *project_name != requirement.name) {
                 // It must be declared as a workspace source.
                 let Some(sources) = sources.as_ref() else {
                     // No sources were declared for the workspace package.
@@ -141,7 +141,7 @@ impl LoweredRequirement {
                 // Support recursive editable inclusions.
                 if has_sources
                     && requirement.version_or_url.is_none()
-                    && !project_name.is_some_and(|project_name| *project_name == requirement.name)
+                    && project_name.is_none_or(|project_name| *project_name != requirement.name)
                 {
                     warn_user_once!(
                         "Missing version constraint (e.g., a lower bound) for `{}`",

crates/uv-distribution/src/source/mod.rs

@@ -1688,7 +1688,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
             .map_err(Error::CacheWrite)?;
         if let Err(err) = rename_with_retry(extracted, target).await {
             // If the directory already exists, accept it.
-            if target.is_dir() {
+            if err.kind() == std::io::ErrorKind::AlreadyExists {
                 warn!("Directory already exists: {}", target.display());
             } else {
                 return Err(Error::CacheWrite(err));
@@ -1749,7 +1749,7 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> {
             .map_err(Error::CacheWrite)?;
         if let Err(err) = rename_with_retry(extracted, target).await {
             // If the directory already exists, accept it.
-            if target.is_dir() {
+            if err.kind() == std::io::ErrorKind::AlreadyExists {
                 warn!("Directory already exists: {}", target.display());
             } else {
                 return Err(Error::CacheWrite(err));