aboutsummaryrefslogtreecommitdiff
path: root/src/api/s3
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-01-26 21:10:21 +0000
committerAlex <alex@adnab.me>2023-01-26 21:10:21 +0000
commitf2c256cac4e599335d592dd580011cf15f278a51 (patch)
tree8a7e90cf4bcf40ef7513e9ffaa636a012ebcc4a9 /src/api/s3
parenta08e01f17a9e4bb80880e28a4a28b2d88a9aec83 (diff)
parentd6af95d20520eec64e5e4c0c873c6e3a8ac1509d (diff)
downloadgarage-f2c256cac4e599335d592dd580011cf15f278a51.tar.gz
garage-f2c256cac4e599335d592dd580011cf15f278a51.zip
Merge pull request 'Many clippy lints fixed' (#488) from k2v-watch-range-2 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/488
Diffstat (limited to 'src/api/s3')
-rw-r--r--src/api/s3/bucket.rs2
-rw-r--r--src/api/s3/post_object.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/api/s3/bucket.rs b/src/api/s3/bucket.rs
index 8471385f..733981e1 100644
--- a/src/api/s3/bucket.rs
+++ b/src/api/s3/bucket.rs
@@ -305,7 +305,7 @@ fn parse_create_bucket_xml(xml_bytes: &[u8]) -> Option<Option<String>> {
let mut ret = None;
for item in cbc.children() {
if item.has_tag_name("LocationConstraint") {
- if ret != None {
+ if ret.is_some() {
return None;
}
ret = Some(item.text()?.to_string());
diff --git a/src/api/s3/post_object.rs b/src/api/s3/post_object.rs
index da542526..f2098ab0 100644
--- a/src/api/s3/post_object.rs
+++ b/src/api/s3/post_object.rs
@@ -140,7 +140,7 @@ pub async fn handle_post_object(
.await?;
let decoded_policy = BASE64_STANDARD
- .decode(&policy)
+ .decode(policy)
.ok_or_bad_request("Invalid policy")?;
let decoded_policy: Policy =
serde_json::from_slice(&decoded_policy).ok_or_bad_request("Invalid policy")?;