clippy issues

Author: HJLebbink

Cargo.toml

@@ -50,20 +50,20 @@ regex = "1.11.1"
 ring = { version = "0.17.14", optional = true, default-features = false, features = ["alloc"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-sha2 = { version = "0.10.8", optional = true }
+sha2 = { version = "0.10.9", optional = true }
 urlencoding = "2.1.3"
 xmltree = "0.11.0"
 futures = "0.3.31"
 http = "1.3.1"
 thiserror = "2.0.12"
 
 [dev-dependencies]
-tokio = { version = "1.46.1", features = ["full"] }
+tokio = { version = "1.47.1", features = ["full"] }
 minio_common = { path = "./common" }
 async-std = { version = "1.13.1", features = ["attributes", "tokio1"] }
-clap = { version = "4.5.41", features = ["derive"] }
+clap = { version = "4.5.44", features = ["derive"] }
 quickcheck = "1.0.3"
-criterion = "0.6.0"
+criterion = "0.7.0"
 minio-macros = { path = "./macros" }
 
 [lib]

benches/s3/common_benches.rs

@@ -169,7 +169,7 @@ pub(crate) fn benchmark_s3_api<ApiType, GlobalSetupFuture>(
 pub(crate) async fn skip_express_mode(bench_name: &str) -> bool {
     let skip = TestContext::new_from_env().client.is_minio_express().await;
     if skip {
-        println!("Skipping benchmark '{}' (MinIO Express mode)", bench_name);
+        println!("Skipping benchmark '{bench_name}' (MinIO Express mode)");
     }
     skip
 }

common/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 minio = {path = ".." }
-tokio = { version = "1.46.1", features = ["full"] }
+tokio = { version = "1.47.1", features = ["full"] }
 async-std = "1.13.1"
 rand = { version = "0.8.5", features = ["small_rng"] }
 bytes = "1.10.1"
@@ -14,7 +14,7 @@ chrono = "0.4.41"
 reqwest = "0.12.22"
 http = "1.3.1"
 futures = "0.3.31"
-uuid = { version = "1.17.0", features = ["v4"] }
+uuid = { version = "1.18.0", features = ["v4"] }
 
 [lib]
 name = "minio_common"

examples/append_object.rs

@@ -57,23 +57,21 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         offset_bytes += data_size;
         if resp.object_size() != offset_bytes {
             panic!(
-                "from the append_object: size mismatch: expected {}, got {}",
+                "from the append_object: size mismatch: expected {}, got {offset_bytes}",
                 resp.object_size(),
-                offset_bytes
             )
         }
-        //println!("Append response: {:#?}", resp);
+        //println!("Append response: {resp:#?}");
 
         let resp: StatObjectResponse = client.stat_object(bucket_name, object_name).send().await?;
         if resp.size()? != offset_bytes {
             panic!(
-                "from the stat_Object: size mismatch: expected {}, got {}",
+                "from the stat_Object: size mismatch: expected {}, got {offset_bytes}",
                 resp.size()?,
-                offset_bytes
             )
         }
-        println!("{}/{}", i, n_segments);
-        //println!("Stat response: {:#?}", resp);
+        println!("{i}/{n_segments}");
+        //println!("Stat response: {resp:#?}");
     }
 
     Ok(())

examples/bucket_encryption.rs

@@ -33,7 +33,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     log::info!("encryption before: config={:?}", resp.config());
 
     let config = SseConfig::default();
-    log::info!("going to set encryption config={:?}", config);
+    log::info!("going to set encryption config={config:?}");
 
     let _resp: PutBucketEncryptionResponse = client
         .put_bucket_encryption(bucket_name)

examples/bucket_lifecycle.rs

@@ -35,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         // TODO
         let resp: GetBucketLifecycleResponse =
             client.get_bucket_lifecycle(bucket_name).send().await?;
-        log::info!("life cycle settings before setting: resp={:?}", resp);
+        log::info!("life cycle settings before setting: resp={resp:?}");
     }
 
     let rules: Vec<LifecycleRule> = vec![LifecycleRule {
@@ -54,20 +54,20 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         .life_cycle_config(LifecycleConfig { rules })
         .send()
         .await?;
-    log::info!("response of setting life cycle config: resp={:?}", resp);
+    log::info!("response of setting life cycle config: resp={resp:?}");
 
     if false {
         // TODO
         let resp: GetBucketLifecycleResponse =
             client.get_bucket_lifecycle(bucket_name).send().await?;
-        log::info!("life cycle settings after setting: resp={:?}", resp);
+        log::info!("life cycle settings after setting: resp={resp:?}");
     }
 
     if false {
         // TODO
         let resp: DeleteBucketLifecycleResponse =
             client.delete_bucket_lifecycle(bucket_name).send().await?;
-        log::info!("response of deleting lifecycle config: resp={:?}", resp);
+        log::info!("response of deleting lifecycle config: resp={resp:?}");
     }
     Ok(())
 }

examples/common.rs

@@ -7,7 +7,7 @@ use minio::s3::{Client, ClientBuilder};
 #[allow(dead_code)]
 pub fn create_client_on_play() -> Result<Client, Box<dyn std::error::Error + Send + Sync>> {
     let base_url = "https://play.min.io".parse::<BaseUrl>()?;
-    log::info!("Trying to connect to MinIO at: `{:?}`", base_url);
+    log::info!("Trying to connect to MinIO at: `{base_url:?}`");
 
     let static_provider = StaticProvider::new(
         "Q3AM3UQ867SPQQA43P2F",
@@ -24,7 +24,7 @@ pub fn create_client_on_play() -> Result<Client, Box<dyn std::error::Error + Sen
 #[allow(dead_code)]
 pub fn create_client_on_localhost() -> Result<Client, Box<dyn std::error::Error + Send + Sync>> {
     let base_url = "http://localhost:9000/".parse::<BaseUrl>()?;
-    log::info!("Trying to connect to MinIO at: `{:?}`", base_url);
+    log::info!("Trying to connect to MinIO at: `{base_url:?}`");
 
     let static_provider = StaticProvider::new("minioadmin", "minioadmin", None);
 

examples/object_prompt.rs

@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 
     //Note: object prompt is not supported on play.min.io, you will need point to AIStor
     let base_url = "http://localhost:9000".parse::<BaseUrl>()?;
-    log::info!("Trying to connect to MinIO at: `{:?}`", base_url);
+    log::info!("Trying to connect to MinIO at: `{base_url:?}`");
 
     let static_provider = StaticProvider::new("admin", "admin", None);
 

src/s3/builders/put_object.rs

@@ -534,7 +534,7 @@ impl ToS3Request for PutObject {
 
 // region: put-object-content
 
-/// PutObjectContent takes a `ObjectContent` stream and uploads it to MinIO/S3.
+/// PutObjectContent takes an `ObjectContent` stream and uploads it to MinIO/S3.
 ///
 /// It is a higher level API and handles multipart uploads transparently.
 #[derive(Default)]
@@ -768,7 +768,7 @@ impl PutObjectContent {
             assert!(buffer_size <= part_size, "{buffer_size} <= {part_size}",);
 
             if (buffer_size == 0) && (part_number > 1) {
-                // We are done as we uploaded at least 1 part and we have reached the end of the stream.
+                // We are done as we uploaded at least 1 part, and we have reached the end of the stream.
                 break;
             }
 
@@ -812,7 +812,7 @@ impl PutObjectContent {
                 size: buffer_size,
             });
 
-            // Finally check if we are done.
+            // Finally, check if we are done.
             if buffer_size < part_size {
                 done = true;
             }
@@ -955,7 +955,7 @@ pub fn calc_part_info(
     }
 
     match (object_size, part_size) {
-        // If object size is unknown, part size must be provided.
+        // If the object size is unknown, the part size must be provided.
         (Size::Unknown, Size::Unknown) => Err(ValidationErr::MissingPartSize),
 
         // If object size is unknown, and part size is known, the number of
@@ -965,8 +965,7 @@ pub fn calc_part_info(
         // If object size is known, and part size is unknown, calculate part
         // size.
         (Size::Known(object_size), Size::Unknown) => {
-            // 1. Calculate the minimum part size (i.e. assuming part count is
-            // maximum).
+            // 1. Calculate the minimum part size (i.e., assuming part count is the maximum).
             let mut psize: u64 = (object_size as f64 / MAX_MULTIPART_COUNT as f64).ceil() as u64;
 
             // 2. Round up to the nearest multiple of MIN_PART_SIZE.
@@ -1024,14 +1023,14 @@ mod tests {
                     }
                 }
             }
-            if let Size::Known(v) = object_size {
-                if v > MAX_OBJECT_SIZE {
+            if let Size::Known(v) = object_size
+                && v > MAX_OBJECT_SIZE {
                     return match res {
                         Err(ValidationErr::InvalidObjectSize(v_err)) => v == v_err,
                         _ => false,
                     }
                 }
-            }
+
 
             // Validate the calculation of part size and part count.
             match (object_size, part_size, res) {

src/s3/minio_error_response.rs

@@ -211,8 +211,7 @@ mod test_error_code {
             let code_obs: MinioErrorCode = str.parse().unwrap();
             assert_eq!(
                 code_obs, *code,
-                "Failed MinioErrorCode round-trip: code {} -> str '{}' -> code {}",
-                code, str, code_obs
+                "Failed MinioErrorCode round-trip: code {code} -> str '{str}' -> code {code_obs}"
             );
         }
     }