refactor: refactor all body.copy_to_bytes(body.remaining()) (#5561)

Co-authored-by: Xuanwo <[email protected]>
apache · Jan 17, 2025 · 753d4a8 · 753d4a8
1 parent 71dd536
commit 753d4a8
Show file tree

Hide file tree

Showing 38 changed files with 75 additions and 93 deletions.
diff --git a/core/src/services/aliyun_drive/error.rs b/core/src/services/aliyun_drive/error.rs
@@ -28,8 +28,8 @@ struct AliyunDriveError {
 }
 
 pub(super) fn parse_error(res: Response<Buffer>) -> Error {
-    let (parts, mut body) = res.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = res.into_parts();
+    let bs = body.to_bytes();
     let (code, message) = serde_json::from_reader::<_, AliyunDriveError>(bs.clone().reader())
         .map(|err| (Some(err.code), err.message))
         .unwrap_or((None, String::from_utf8_lossy(&bs).into_owned()));

diff --git a/core/src/services/alluxio/error.rs b/core/src/services/alluxio/error.rs
@@ -32,8 +32,8 @@ struct AlluxioError {
 }
 
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let mut kind = match parts.status.as_u16() {
         500 => ErrorKind::Unexpected,

diff --git a/core/src/services/azdls/error.rs b/core/src/services/azdls/error.rs
@@ -60,8 +60,8 @@ impl Debug for AzdlsError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/azfile/error.rs b/core/src/services/azfile/error.rs
@@ -60,8 +60,8 @@ impl Debug for AzfileError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/b2/error.rs b/core/src/services/b2/error.rs
@@ -33,8 +33,8 @@ struct B2Error {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (mut kind, mut retryable) = match parts.status.as_u16() {
         403 => (ErrorKind::PermissionDenied, false),

diff --git a/core/src/services/chainsafe/error.rs b/core/src/services/chainsafe/error.rs
@@ -37,8 +37,8 @@ struct ChainsafeSubError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status.as_u16() {
         401 | 403 => (ErrorKind::PermissionDenied, false),

diff --git a/core/src/services/cloudflare_kv/error.rs b/core/src/services/cloudflare_kv/error.rs
@@ -27,8 +27,8 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (mut kind, mut retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/cos/error.rs b/core/src/services/cos/error.rs
@@ -37,8 +37,8 @@ struct CosError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/d1/backend.rs b/core/src/services/d1/backend.rs
@@ -18,7 +18,6 @@
 use std::fmt::Debug;
 use std::fmt::Formatter;
 
-use bytes::Buf;
 use http::header;
 use http::Request;
 use http::StatusCode;
@@ -287,8 +286,8 @@ impl kv::Adapter for Adapter {
         let status = resp.status();
         match status {
             StatusCode::OK | StatusCode::PARTIAL_CONTENT => {
-                let mut body = resp.into_body();
-                let bs = body.copy_to_bytes(body.remaining());
+                let body = resp.into_body();
+                let bs = body.to_bytes();
                 let d1_response = D1Response::parse(&bs)?;
                 Ok(d1_response.get_result(&self.value_field))
             }

diff --git a/core/src/services/d1/error.rs b/core/src/services/d1/error.rs
@@ -27,8 +27,8 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (mut kind, mut retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/dbfs/error.rs b/core/src/services/dbfs/error.rs
@@ -17,7 +17,6 @@
 
 use std::fmt::Debug;
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 use serde::Deserialize;
@@ -44,8 +43,8 @@ impl Debug for DbfsError {
 }
 
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/dropbox/error.rs b/core/src/services/dropbox/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 use serde::Deserialize;
@@ -31,8 +30,8 @@ pub struct DropboxErrorResponse {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (mut kind, mut retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/gdrive/error.rs b/core/src/services/gdrive/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 use serde::Deserialize;
@@ -35,8 +34,8 @@ struct GdriveInnerError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (mut kind, mut retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/ghac/error.rs b/core/src/services/ghac/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 
@@ -24,7 +23,7 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
+    let (parts, body) = resp.into_parts();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND | StatusCode::NO_CONTENT => (ErrorKind::NotFound, false),
@@ -38,7 +37,7 @@ pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
         _ => (ErrorKind::Unexpected, false),
     };
 
-    let bs = body.copy_to_bytes(body.remaining());
+    let bs = body.to_bytes();
     let message = String::from_utf8_lossy(&bs);
 
     let mut err = Error::new(kind, message);

diff --git a/core/src/services/github/error.rs b/core/src/services/github/error.rs
@@ -37,8 +37,8 @@ struct GithubSubError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status.as_u16() {
         401 | 403 => (ErrorKind::PermissionDenied, false),

diff --git a/core/src/services/http/error.rs b/core/src/services/http/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 
@@ -24,8 +23,8 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/huggingface/error.rs b/core/src/services/huggingface/error.rs
@@ -17,7 +17,6 @@
 
 use std::fmt::Debug;
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 use serde::Deserialize;
@@ -41,8 +40,8 @@ impl Debug for HuggingfaceError {
 }
 
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/icloud/core.rs b/core/src/services/icloud/core.rs
@@ -569,8 +569,8 @@ impl PathQuery for IcloudPathQuery {
 }
 
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let mut kind = match parts.status.as_u16() {
         421 | 450 | 500 => ErrorKind::NotFound,

diff --git a/core/src/services/ipfs/error.rs b/core/src/services/ipfs/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 
@@ -24,8 +23,8 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/ipmfs/error.rs b/core/src/services/ipmfs/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 use serde::Deserialize;
@@ -45,8 +44,8 @@ struct IpfsError {
 ///
 /// ref: https://docs.ipfs.tech/reference/kubo/rpc/#http-status-codes
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let ipfs_error = de::from_slice::<IpfsError>(&bs).ok();
 

diff --git a/core/src/services/koofr/error.rs b/core/src/services/koofr/error.rs
@@ -15,16 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 
 use crate::raw::*;
 use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status.as_u16() {
         403 => (ErrorKind::PermissionDenied, false),

diff --git a/core/src/services/lakefs/error.rs b/core/src/services/lakefs/error.rs
@@ -17,7 +17,6 @@
 
 use std::fmt::Debug;
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 use serde::Deserialize;
@@ -41,8 +40,8 @@ impl Debug for LakefsError {
 }
 
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/libsql/error.rs b/core/src/services/libsql/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 
@@ -24,8 +23,8 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/obs/error.rs b/core/src/services/obs/error.rs
@@ -37,8 +37,8 @@ struct ObsError {
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/onedrive/error.rs b/core/src/services/onedrive/error.rs
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use bytes::Buf;
 use http::Response;
 use http::StatusCode;
 
@@ -24,8 +23,8 @@ use crate::*;
 
 /// Parse error response into Error.
 pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
-    let (parts, mut body) = resp.into_parts();
-    let bs = body.copy_to_bytes(body.remaining());
+    let (parts, body) = resp.into_parts();
+    let bs = body.to_bytes();
 
     let (kind, retryable) = match parts.status {
         StatusCode::NOT_FOUND => (ErrorKind::NotFound, false),

diff --git a/core/src/services/onedrive/writer.rs b/core/src/services/onedrive/writer.rs
@@ -122,7 +122,7 @@ impl OneDriveWriter {
     }
 
     async fn create_upload_session(&self) -> Result<OneDriveUploadSessionCreationResponseBody> {
-        let file_name_from_path = self.path.split('/').last().ok_or_else(|| {
+        let file_name_from_path = self.path.split('/').next_back().ok_or_else(|| {
             Error::new(
                 ErrorKind::Unexpected,
                 "connection string must have AccountName",