src/api/error.rs

@@ -206,11 +206,7 @@ where
 	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
 		match self {
 			Ok(x) => Ok(x),
-			Err(e) => Err(Error::BadRequest(format!(
+			Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
-				"{}: {}",
-				reason.as_ref(),
-				e.to_string()
-			))),
 		}
 	}
 }

src/api/s3_copy.rs

@@ -487,7 +487,7 @@ impl CopyPreconditionHeaders {
 				.get("x-amz-copy-source-if-modified-since")
 				.map(|x| x.to_str())
 				.transpose()?
-				.map(|x| httpdate::parse_http_date(x))
+				.map(httpdate::parse_http_date)
 				.transpose()
 				.ok_or_bad_request("Invalid date in x-amz-copy-source-if-modified-since")?,
 			copy_source_if_none_match: req
@@ -505,7 +505,7 @@ impl CopyPreconditionHeaders {
 				.get("x-amz-copy-source-if-unmodified-since")
 				.map(|x| x.to_str())
 				.transpose()?
-				.map(|x| httpdate::parse_http_date(x))
+				.map(httpdate::parse_http_date)
 				.transpose()
 				.ok_or_bad_request("Invalid date in x-amz-copy-source-if-unmodified-since")?,
 		})

src/api/s3_list.rs

@@ -121,7 +121,7 @@ pub async fn handle_list(
 				key: uriencode_maybe(key, query.common.urlencode_resp),
 				last_modified: s3_xml::Value(msec_to_rfc3339(info.last_modified)),
 				size: s3_xml::IntValue(info.size as i64),
-				etag: s3_xml::Value(format!("\"{}\"", info.etag.to_string())),
+				etag: s3_xml::Value(format!("\"{}\"", info.etag)),
 				storage_class: s3_xml::Value("STANDARD".to_string()),
 			})
 			.collect(),

src/model/helper/error.rs

@@ -31,11 +31,7 @@ where
 	fn ok_or_bad_request<M: AsRef<str>>(self, reason: M) -> Result<T, Error> {
 		match self {
 			Ok(x) => Ok(x),
-			Err(e) => Err(Error::BadRequest(format!(
+			Err(e) => Err(Error::BadRequest(format!("{}: {}", reason.as_ref(), e))),
-				"{}: {}",
-				reason.as_ref(),
-				e.to_string()
-			))),
 		}
 	}
 }