mirror of
https://github.com/deuxfleurs-org/garage.git
synced 2026-08-21 10:26:36 +00:00
More clippy fixes
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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")?)
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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")?;
|
||||
|
||||
Reference in New Issue
Block a user