cargo clippy

Signed-off-by: tison <[email protected]>
tisonkun · May 20, 2023 · f8aa2dc · f8aa2dc
1 parent a5d43a5
commit f8aa2dc
Show file tree

Hide file tree

Showing 29 changed files with 37 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/java/src/lib.rs b/bindings/java/src/lib.rs
@@ -49,7 +49,7 @@ pub unsafe extern "system" fn JNI_OnLoad(vm: JavaVM, _: *mut c_void) -> jint {
     let runtime = Builder::new_multi_thread()
         .worker_threads(num_cpus::get())
         .on_thread_stop(move || {
-            VM.get().map(|vm| vm.detach_current_thread());
+            if let Some(vm) = VM.get() { vm.detach_current_thread() }
         })
         .build()
         .unwrap();
@@ -64,8 +64,8 @@ pub unsafe extern "system" fn JNI_OnLoad(vm: JavaVM, _: *mut c_void) -> jint {
 /// This function could be only called by java vm when unload this lib.
 #[no_mangle]
 pub unsafe extern "system" fn JNI_OnUnload(_: JavaVM, _: *mut c_void) {
-    RUNTIME.take().map(|r| r.shutdown_background());
-    VM.take().map(|vm| vm.detach_current_thread());
+    if let Some(r) = RUNTIME.take() { r.shutdown_background() }
+    if let Some(vm) = VM.take() { vm.detach_current_thread() }
 }
 
 #[no_mangle]

diff --git a/core/src/layers/complete.rs b/core/src/layers/complete.rs
@@ -553,7 +553,7 @@ where
             if self.written + n as u64 > size {
                 return Err(Error::new(
                     ErrorKind::ContentTruncated,
-                    &format!(
+                    format!(
                         "writer got too much data, expect: {size}, actual: {}",
                         self.written + n as u64
                     ),
@@ -585,7 +585,7 @@ where
             if self.written < size {
                 return Err(Error::new(
                     ErrorKind::ContentIncomplete,
-                    &format!(
+                    format!(
                         "writer got too less data, expect: {size}, actual: {}",
                         self.written
                     ),
@@ -615,7 +615,7 @@ where
             if self.written + n as u64 > size {
                 return Err(Error::new(
                     ErrorKind::ContentTruncated,
-                    &format!(
+                    format!(
                         "writer got too much data, expect: {size}, actual: {}",
                         self.written + n as u64
                     ),
@@ -637,7 +637,7 @@ where
             if self.written < size {
                 return Err(Error::new(
                     ErrorKind::ContentIncomplete,
-                    &format!(
+                    format!(
                         "writer got too less data, expect: {size}, actual: {}",
                         self.written
                     ),

diff --git a/core/src/layers/immutable_index.rs b/core/src/layers/immutable_index.rs
@@ -176,7 +176,7 @@ impl<A: Accessor> LayeredAccessor for ImmutableIndexAccessor<A> {
         } else {
             return Err(Error::new(
                 ErrorKind::Unsupported,
-                &format!("delimiter {} is not supported", args.delimiter()),
+                format!("delimiter {} is not supported", args.delimiter()),
             ));
         };
 
@@ -212,7 +212,7 @@ impl<A: Accessor> LayeredAccessor for ImmutableIndexAccessor<A> {
         } else {
             return Err(Error::new(
                 ErrorKind::Unsupported,
-                &format!("delimiter {} is not supported", args.delimiter()),
+                format!("delimiter {} is not supported", args.delimiter()),
             ));
         };
 

diff --git a/core/src/raw/http_util/body.rs b/core/src/raw/http_util/body.rs
@@ -128,12 +128,12 @@ impl IncomingAsyncBody {
             Ordering::Equal => Ok(()),
             Ordering::Less => Err(Error::new(
                 ErrorKind::ContentIncomplete,
-                &format!("reader got too less data, expect: {expect}, actual: {actual}"),
+                format!("reader got too less data, expect: {expect}, actual: {actual}"),
             )
             .set_temporary()),
             Ordering::Greater => Err(Error::new(
                 ErrorKind::ContentTruncated,
-                &format!("reader got too much data, expect: {expect}, actual: {actual}"),
+                format!("reader got too much data, expect: {expect}, actual: {actual}"),
             )
             .set_temporary()),
         }

diff --git a/core/src/services/azblob/backend.rs b/core/src/services/azblob/backend.rs
@@ -675,7 +675,7 @@ impl Accessor for AzblobBackend {
             .map_err(|e| {
                 Error::new(
                     ErrorKind::Unexpected,
-                    &format!("get invalid CONTENT_TYPE header in response: {:?}", e),
+                    format!("get invalid CONTENT_TYPE header in response: {:?}", e),
                 )
             })?;
         let splits = content_type.split("boundary=").collect::<Vec<&str>>();
@@ -690,7 +690,7 @@ impl Accessor for AzblobBackend {
         let body = String::from_utf8(body.to_vec()).map_err(|e| {
             Error::new(
                 ErrorKind::Unexpected,
-                &format!("get invalid batch response {e:?}"),
+                format!("get invalid batch response {e:?}"),
             )
         })?;
 

diff --git a/core/src/services/azblob/batch.rs b/core/src/services/azblob/batch.rs
@@ -61,14 +61,14 @@ pub(super) fn parse_batch_delete_response(
             .map_err(|e| {
                 Error::new(
                     ErrorKind::Unexpected,
-                    &format!("invalid status code: {:?}", e),
+                    format!("invalid status code: {:?}", e),
                 )
             })?
             .try_into()
             .map_err(|e| {
                 Error::new(
                     ErrorKind::Unexpected,
-                    &format!("invalid status code: {:?}", e),
+                    format!("invalid status code: {:?}", e),
                 )
             })?;
 

diff --git a/core/src/services/azblob/error.rs b/core/src/services/azblob/error.rs
@@ -73,7 +73,7 @@ pub fn parse_http_error(status: StatusCode, body: &str) -> Result<Error> {
         Ok(err) => format!("{err:?}"),
         Err(_) => body.to_string(),
     };
-    let mut err = Error::new(kind, &message).with_context("response", body.to_string());
+    let mut err = Error::new(kind, message).with_context("response", body.to_string());
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/cos/error.rs b/core/src/services/cos/error.rs
@@ -63,7 +63,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         Err(_) => String::from_utf8_lossy(&bs).into_owned(),
     };
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/fs/error.rs b/core/src/services/fs/error.rs
@@ -31,7 +31,7 @@ pub fn parse_io_error(err: io::Error) -> Error {
         _ => (ErrorKind::Unexpected, true),
     };
 
-    let mut err = Error::new(kind, &err.kind().to_string()).set_source(err);
+    let mut err = Error::new(kind, err.kind().to_string()).set_source(err);
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/gcs/error.rs b/core/src/services/gcs/error.rs
@@ -72,7 +72,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         Err(_) => String::from_utf8_lossy(&bs).into_owned(),
     };
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/gdrive/core.rs b/core/src/services/gdrive/core.rs
@@ -130,7 +130,7 @@ impl GdriveCore {
                     serde_json::from_slice(resp_body).map_err(new_json_deserialize_error)?;
 
                 if gdrive_file_list.files.len() != 1 {
-                    return Err(Error::new(ErrorKind::Unexpected, &format!("Please ensure that the file corresponding to the path exists and is unique. The response body is {}", String::from_utf8_lossy(resp_body))));
+                    return Err(Error::new(ErrorKind::Unexpected, format!("Please ensure that the file corresponding to the path exists and is unique. The response body is {}", String::from_utf8_lossy(resp_body))));
                 }
 
                 parent_id = gdrive_file_list.files[0].id.clone();

diff --git a/core/src/services/gdrive/error.rs b/core/src/services/gdrive/error.rs
@@ -38,7 +38,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/ghac/error.rs b/core/src/services/ghac/error.rs
@@ -40,7 +40,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
     };
 
     let bs = body.bytes().await?;
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/hdfs/error.rs b/core/src/services/hdfs/error.rs
@@ -35,7 +35,7 @@ pub fn parse_io_error(err: io::Error) -> Error {
         _ => (ErrorKind::Unexpected, true),
     };
 
-    let mut err = Error::new(kind, &err.kind().to_string()).set_source(err);
+    let mut err = Error::new(kind, err.kind().to_string()).set_source(err);
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/http/error.rs b/core/src/services/http/error.rs
@@ -41,7 +41,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/ipfs/error.rs b/core/src/services/ipfs/error.rs
@@ -40,7 +40,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/ipmfs/error.rs b/core/src/services/ipmfs/error.rs
@@ -73,7 +73,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         None => String::from_utf8_lossy(&bs).into_owned(),
     };
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/memcached/backend.rs b/core/src/services/memcached/backend.rs
@@ -311,5 +311,5 @@ impl bb8::ManageConnection for MemcacheConnectionManager {
 }
 
 pub fn parse_io_error(err: std::io::Error) -> Error {
-    Error::new(ErrorKind::Unexpected, &err.kind().to_string()).set_source(err)
+    Error::new(ErrorKind::Unexpected, err.kind().to_string()).set_source(err)
 }
diff --git a/core/src/services/obs/error.rs b/core/src/services/obs/error.rs
@@ -63,7 +63,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         Err(_) => String::from_utf8_lossy(&bs).into_owned(),
     };
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/onedrive/error.rs b/core/src/services/onedrive/error.rs
@@ -38,7 +38,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/oss/error.rs b/core/src/services/oss/error.rs
@@ -59,7 +59,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         Err(_) => String::from_utf8_lossy(&bs).into_owned(),
     };
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/s3/error.rs b/core/src/services/s3/error.rs
@@ -62,7 +62,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         (kind, retryable) = parse_s3_error_code(s3_err.code.as_str()).unwrap_or((kind, retryable));
     }
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/supabase/error.rs b/core/src/services/supabase/error.rs
@@ -47,7 +47,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         })
         .unwrap_or_else(|_| (String::from_utf8_lossy(&bs).into_owned(), None));
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/vercel_artifacts/error.rs b/core/src/services/vercel_artifacts/error.rs
@@ -38,7 +38,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/wasabi/error.rs b/core/src/services/wasabi/error.rs
@@ -70,7 +70,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         }
     }
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();

diff --git a/core/src/services/webdav/error.rs b/core/src/services/webdav/error.rs
@@ -38,7 +38,7 @@ pub async fn parse_error(resp: Response<IncomingAsyncBody>) -> Result<Error> {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let mut err = Error::new(kind, &String::from_utf8_lossy(&bs))
+    let mut err = Error::new(kind, String::from_utf8_lossy(&bs))
         .with_context("response", format!("{parts:?}"));
 
     if retryable {

diff --git a/core/src/services/webdav/list_response.rs b/core/src/services/webdav/list_response.rs
@@ -58,7 +58,7 @@ impl ListOpResponse {
             if code >= 400 {
                 return Err(Error::new(
                     ErrorKind::Unexpected,
-                    &format!("Invalid response: {} {}", code, text),
+                    format!("Invalid response: {} {}", code, text),
                 ));
             }
         }

diff --git a/core/src/services/webhdfs/error.rs b/core/src/services/webhdfs/error.rs
@@ -65,7 +65,7 @@ fn parse_error_msg(parts: Parts, body: &str) -> Result<Error> {
         Err(_) => body.to_owned(),
     };
 
-    let mut err = Error::new(kind, &message).with_context("response", format!("{parts:?}"));
+    let mut err = Error::new(kind, message).with_context("response", format!("{parts:?}"));
 
     if retryable {
         err = err.set_temporary();