From 7e5ecb71142153702c47e6ad33f844dc553500ba Mon Sep 17 00:00:00 2001 From: durch Date: Fri, 4 Mar 2022 10:02:37 +0100 Subject: [PATCH] cargo fmt --- s3/src/bucket.rs | 8 ++++---- s3/src/utils.rs | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/s3/src/bucket.rs b/s3/src/bucket.rs index 6cef8b9579..1f22b78d5f 100644 --- a/s3/src/bucket.rs +++ b/s3/src/bucket.rs @@ -43,11 +43,11 @@ use crate::serde_types::{ BucketLocationResult, CompleteMultipartUploadData, HeadObjectResult, InitiateMultipartUploadResponse, ListBucketResult, ListMultipartUploadsResult, Part, }; +use crate::utils::error_from_response_data; use anyhow::anyhow; use anyhow::Result; use http::header::HeaderName; use http::HeaderMap; -use crate::utils::error_from_response_data; pub const CHUNK_SIZE: usize = 8_388_608; // 8 Mebibytes, min is 5 (5_242_880); @@ -758,7 +758,7 @@ impl Bucket { if first_chunk.len() < CHUNK_SIZE { let (data, code) = self.put_object(s3_path, first_chunk.as_slice()).await?; if code >= 300 { - return Err(error_from_response_data(data, code)) + return Err(error_from_response_data(data, code)); } return Ok(code); } @@ -767,7 +767,7 @@ impl Bucket { let request = RequestImpl::new(self, s3_path, command); let (data, code) = request.response_data(false).await?; if code >= 300 { - return Err(error_from_response_data(data, code)) + return Err(error_from_response_data(data, code)); } let msg: InitiateMultipartUploadResponse = @@ -828,7 +828,7 @@ impl Bucket { let request = RequestImpl::new(self, s3_path, command); let (data, code) = request.response_data(false)?; if code >= 300 { - return Err(error_from_response_data(data, code)) + return Err(error_from_response_data(data, code)); } let msg: InitiateMultipartUploadResponse = serde_xml::from_str(std::str::from_utf8(data.as_slice())?)?; diff --git a/s3/src/utils.rs b/s3/src/utils.rs index 6ecb47911d..a3b4a61362 100644 --- a/s3/src/utils.rs +++ b/s3/src/utils.rs @@ -184,10 +184,7 @@ pub(crate) fn error_from_response_data(data: Vec, code: u16) -> anyhow::Erro code ) }; - anyhow::Error::new(std::io::Error::new( - std::io::ErrorKind::InvalidData, - err, - )) + anyhow::Error::new(std::io::Error::new(std::io::ErrorKind::InvalidData, err)) } #[cfg(test)]