cargo clippy

Author: HJLebbink

src/s3/builders/copy_object.rs

@@ -969,16 +969,16 @@ impl ComposeSource {
     }
 
     pub fn build_headers(&mut self, object_size: u64, etag: String) -> Result<(), ValidationErr> {
-        if let Some(v) = self.offset {
-            if v >= object_size {
-                return Err(ValidationErr::InvalidComposeSourceOffset {
-                    bucket: self.bucket.to_string(),
-                    object: self.object.to_string(),
-                    version: self.version_id.clone(),
-                    offset: v,
-                    object_size,
-                });
-            }
+        if let Some(v) = self.offset
+            && v >= object_size
+        {
+            return Err(ValidationErr::InvalidComposeSourceOffset {
+                bucket: self.bucket.to_string(),
+                object: self.object.to_string(),
+                version: self.version_id.clone(),
+                offset: v,
+                object_size,
+            });
         }
 
         if let Some(v) = self.length {

src/s3/builders/put_object.rs

@@ -414,19 +414,19 @@ impl ToS3Request for UploadPart {
             check_bucket_name(&self.bucket, true)?;
             check_object_name(&self.object)?;
 
-            if let Some(upload_id) = &self.upload_id {
-                if upload_id.is_empty() {
-                    return Err(ValidationErr::InvalidUploadId(
-                        "upload ID cannot be empty".into(),
-                    ));
-                }
+            if let Some(upload_id) = &self.upload_id
+                && upload_id.is_empty()
+            {
+                return Err(ValidationErr::InvalidUploadId(
+                    "upload ID cannot be empty".into(),
+                ));
             }
-            if let Some(part_number) = self.part_number {
-                if !(1..=MAX_MULTIPART_COUNT).contains(&part_number) {
-                    return Err(ValidationErr::InvalidPartNumber(format!(
-                        "part number must be between 1 and {MAX_MULTIPART_COUNT}"
-                    )));
-                }
+            if let Some(part_number) = self.part_number
+                && !(1..=MAX_MULTIPART_COUNT).contains(&part_number)
+            {
+                return Err(ValidationErr::InvalidPartNumber(format!(
+                    "part number must be between 1 and {MAX_MULTIPART_COUNT}"
+                )));
             }
         }
 
@@ -948,10 +948,10 @@ pub fn calc_part_info(
         }
     }
 
-    if let Size::Known(v) = object_size {
-        if v > MAX_OBJECT_SIZE {
-            return Err(ValidationErr::InvalidObjectSize(v));
-        }
+    if let Size::Known(v) = object_size
+        && v > MAX_OBJECT_SIZE
+    {
+        return Err(ValidationErr::InvalidObjectSize(v));
     }
 
     match (object_size, part_size) {

src/s3/client.rs

@@ -540,12 +540,11 @@ impl Client {
         )?;
 
         // If the error is a NoSuchBucket or RetryHead, remove the bucket from the region map.
-        if matches!(e.code(), MinioErrorCode::NoSuchBucket)
-            || matches!(e.code(), MinioErrorCode::RetryHead)
+        if (matches!(e.code(), MinioErrorCode::NoSuchBucket)
+            || matches!(e.code(), MinioErrorCode::RetryHead))
+            && let Some(v) = bucket_name
         {
-            if let Some(v) = bucket_name {
-                self.shared.region_map.remove(v);
-            }
+            self.shared.region_map.remove(v);
         };
 
         Err(Error::S3Server(S3ServerError::S3Error(Box::new(e))))
@@ -637,13 +636,14 @@ impl SharedClientItems {
             message.push_str(region);
         }
 
-        if retry && !region.is_empty() && (method == Method::HEAD) {
-            if let Some(v) = bucket_name {
-                if self.region_map.contains_key(v) {
-                    code = MinioErrorCode::RetryHead;
-                    message = String::new();
-                }
-            }
+        if retry
+            && !region.is_empty()
+            && (method == Method::HEAD)
+            && let Some(v) = bucket_name
+            && self.region_map.contains_key(v)
+        {
+            code = MinioErrorCode::RetryHead;
+            message = String::new();
         }
 
         Ok((code, message))