fix

rustfs · likewu · Jul 5, 2025 · Jul 5, 2025 · Jul 5, 2025 · Jul 6, 2025
commit 969bdc2efc89ab54df6de901b73b2b66a71341b6
diff --git a/cli/rustfs-gui/src/utils/helper.rs b/cli/rustfs-gui/src/utils/helper.rs
@@ -371,7 +371,7 @@ impl ServiceManager {
                 StdCommand::new("taskkill")
                     .arg("/F")
                     .arg("/PID")
-                    .arg(&service_pid.to_string())
+                    .arg(service_pid.to_string())
                     .output()?;
             }
 

diff --git a/crates/checksums/src/base64.rs b/crates/checksums/src/base64.rs
@@ -16,7 +16,7 @@ use base64_simd::STANDARD;
 use std::error::Error;
 
 #[derive(Debug)]
-pub struct DecodeError(base64_simd::Error);
+pub(crate) struct DecodeError(base64_simd::Error);
 
 impl Error for DecodeError {
     fn source(&self) -> Option<&(dyn Error + 'static)> {
@@ -30,14 +30,14 @@ impl std::fmt::Display for DecodeError {
     }
 }
 
-pub fn decode(input: impl AsRef<str>) -> Result<Vec<u8>, DecodeError> {
+pub(crate) fn decode(input: impl AsRef<str>) -> Result<Vec<u8>, DecodeError> {
     STANDARD.decode_to_vec(input.as_ref()).map_err(DecodeError)
 }
 
-pub fn encode(input: impl AsRef<[u8]>) -> String {
+pub(crate) fn encode(input: impl AsRef<[u8]>) -> String {
     STANDARD.encode_to_string(input.as_ref())
 }
 
-pub fn encoded_length(length: usize) -> usize {
+pub(crate) fn encoded_length(length: usize) -> usize {
     STANDARD.encoded_length(length)
 }
diff --git a/crates/checksums/src/lib.rs b/crates/checksums/src/lib.rs
@@ -353,7 +353,7 @@ mod tests {
             acc
         });
 
-        format!("0x{}", decoded_checksum)
+        format!("0x{decoded_checksum}")
     }
 
     #[test]

diff --git a/crates/ecstore/src/client/api_put_object_multipart.rs b/crates/ecstore/src/client/api_put_object_multipart.rs
@@ -34,17 +34,12 @@ use crate::client::{
     api_s3_datatypes::{
         CompleteMultipartUpload, CompleteMultipartUploadResult, CompletePart, InitiateMultipartUploadResult, ObjectPart,
     },
-    constants::{ABS_MIN_PART_SIZE, ISO8601_DATEFORMAT, MAX_PART_SIZE, MAX_SINGLE_PUT_OBJECT_SIZE},
+    constants::{ISO8601_DATEFORMAT, MAX_PART_SIZE, MAX_SINGLE_PUT_OBJECT_SIZE},
     transition_api::{ReaderImpl, RequestMetadata, TransitionClient, UploadInfo},
 };
-use crate::{
-    checksum::ChecksumMode,
-    disk::DiskAPI,
-    store_api::{GetObjectReader, StorageAPI},
-};
+use crate::{checksum::ChecksumMode, disk::DiskAPI, store_api::StorageAPI};
 use rustfs_utils::{crypto::base64_encode, path::trim_etag};
 use s3s::header::{X_AMZ_EXPIRATION, X_AMZ_VERSION_ID};
-use s3s::{Body, dto::StreamingBlob};
 
 impl TransitionClient {
     pub async fn put_object_multipart(

diff --git a/crates/utils/src/retry.rs b/crates/utils/src/retry.rs
@@ -18,7 +18,7 @@ use std::{
     pin::Pin,
     sync::LazyLock,
     task::{Context, Poll},
-    time::{Duration, Instant},
+    time::Duration,
 };
 use tokio::time::interval;
 
@@ -114,20 +114,24 @@ pub fn is_http_status_retryable(http_statuscode: &http::StatusCode) -> bool {
 }
 
 pub fn is_request_error_retryable(_err: std::io::Error) -> bool {
-    /*if err == Err::Canceled) || err == Err::DeadlineExceeded) {
-        return ctx.Err() == nil;
+    /*if err == Err::Canceled || err == Err::DeadlineExceeded {
+        return err() == nil;
     }
-    let ue = err.(*url.Error);
-    if ue.is_ok() {
-        let e = ue.Unwrap();
-        switch e.(type) {
-        case x509.UnknownAuthorityError:
-            return false;
-        }
-        switch e.Error() {
-        case "http: server gave HTTP response to HTTPS client":
-            return false;
-        }
+    let uerr = err.(*url.Error);
+    if uerr.is_ok() {
+        let e = uerr.unwrap();
+        return match e.type {
+            x509.UnknownAuthorityError => {
+                false
+            }
+            _ => true,
+        };
+        return match e.error() {
+            "http: server gave HTTP response to HTTPS client" => {
+                false
+            }
+            _ => rue,
+        };
     }
     true*/
     todo!();

diff --git a/crates/utils/src/sys/user_agent.rs b/crates/utils/src/sys/user_agent.rs
@@ -88,7 +88,7 @@ impl UserAgent {
             Some(version) => version,
             None => "Windows NT Unknown".to_string(),
         };
-        format!("Windows NT {}", version)
+        format!("Windows NT {version}")
     }
 
     #[cfg(not(windows))]
-Original file line number
+Diff line change
@@ Expand Up / @@ -353,7 +353,7 @@ mod tests { @@
                 acc
             });
-            format!("0x{}", decoded_checksum)
+            format!("0x{decoded_checksum}")
         }
         #[test]
@@ Expand Down @@