diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-26 17:26:32 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-26 17:26:32 +0100 |
| commit | 8e93d6997415d60ba5c371da8b27065a57254a8c (patch) | |
| tree | 8bf3c182ca5d70bd242cc691d2b1fee65c8b6cd3 /src/api | |
| parent | 3113f6b5f2a688a3f7c4f933774866f48618f7d1 (diff) | |
| download | garage-8e93d6997415d60ba5c371da8b27065a57254a8c.tar.gz garage-8e93d6997415d60ba5c371da8b27065a57254a8c.zip | |
More clippy fixes
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/admin/api_server.rs | 2 | ||||
| -rw-r--r-- | src/api/admin/bucket.rs | 4 | ||||
| -rw-r--r-- | src/api/s3/bucket.rs | 2 | ||||
| -rw-r--r-- | src/api/s3/post_object.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/api/admin/api_server.rs b/src/api/admin/api_server.rs index 7a534f32..a115d732 100644 --- a/src/api/admin/api_server.rs +++ b/src/api/admin/api_server.rs @@ -103,7 +103,7 @@ impl AdminApiServer { .bucket_helper() .resolve_global_bucket_name(&domain_string) .await? - .ok_or_else(|| HelperError::NoSuchBucket(domain_string))?; + .ok_or(HelperError::NoSuchBucket(domain_string))?; let bucket = self .garage diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs index 65034852..e60f07ca 100644 --- a/src/api/admin/bucket.rs +++ b/src/api/admin/bucket.rs @@ -167,7 +167,7 @@ async fn bucket_info_results( let quotas = state.quotas.get(); let res = GetBucketInfoResult { - id: hex::encode(&bucket.id), + id: hex::encode(bucket.id), global_aliases: state .aliases .items() @@ -575,6 +575,6 @@ pub async fn handle_local_unalias_bucket( // ---- HELPER ---- fn parse_bucket_id(id: &str) -> Result<Uuid, Error> { - let id_hex = hex::decode(&id).ok_or_bad_request("Invalid bucket id")?; + let id_hex = hex::decode(id).ok_or_bad_request("Invalid bucket id")?; Ok(Uuid::try_from(&id_hex).ok_or_bad_request("Invalid bucket id")?) } 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")?; |