aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-05-04 19:44:01 +0200
committerAlex Auvolat <alex@adnab.me>2023-06-09 16:23:37 +0200
commit412ab77b0815f165539fe41713c0155a9878672f (patch)
treee792e8c56b1702701ab443b5466c2fd7f2db97b0 /src/api
parent511e07ecd489fa72040171fe908323873a57ac19 (diff)
downloadgarage-412ab77b0815f165539fe41713c0155a9878672f.tar.gz
garage-412ab77b0815f165539fe41713c0155a9878672f.zip
comments and clippy lint fixes
Diffstat (limited to 'src/api')
-rw-r--r--src/api/admin/bucket.rs4
-rw-r--r--src/api/admin/key.rs4
-rw-r--r--src/api/s3/get.rs4
-rw-r--r--src/api/s3/multipart.rs8
4 files changed, 9 insertions, 11 deletions
diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs
index 6ccc3808..17f46c30 100644
--- a/src/api/admin/bucket.rs
+++ b/src/api/admin/bucket.rs
@@ -192,8 +192,8 @@ async fn bucket_info_results(
}
}),
keys: relevant_keys
- .into_iter()
- .map(|(_, key)| {
+ .into_values()
+ .map(|key| {
let p = key.state.as_option().unwrap();
GetBucketInfoKey {
access_key_id: key.key_id,
diff --git a/src/api/admin/key.rs b/src/api/admin/key.rs
index 2bbabb7b..d74ca361 100644
--- a/src/api/admin/key.rs
+++ b/src/api/admin/key.rs
@@ -183,8 +183,8 @@ async fn key_info_results(garage: &Arc<Garage>, key: Key) -> Result<Response<Bod
create_bucket: *key_state.allow_create_bucket.get(),
},
buckets: relevant_buckets
- .into_iter()
- .map(|(_, bucket)| {
+ .into_values()
+ .map(|bucket| {
let state = bucket.state.as_option().unwrap();
KeyInfoBucketResult {
id: hex::encode(bucket.id),
diff --git a/src/api/s3/get.rs b/src/api/s3/get.rs
index aa391745..5e682726 100644
--- a/src/api/s3/get.rs
+++ b/src/api/s3/get.rs
@@ -441,7 +441,7 @@ fn body_from_blocks_range(
// block.part_number, which is not the same in the case of a multipart upload)
let mut blocks: Vec<(VersionBlock, u64)> = Vec::with_capacity(std::cmp::min(
all_blocks.len(),
- 4 + ((end - begin) / std::cmp::max(all_blocks[0].1.size as u64, 1024)) as usize,
+ 4 + ((end - begin) / std::cmp::max(all_blocks[0].1.size, 1024)) as usize,
));
let mut block_offset: u64 = 0;
for (_, b) in all_blocks.iter() {
@@ -452,7 +452,7 @@ fn body_from_blocks_range(
if block_offset < end && block_offset + b.size > begin {
blocks.push((*b, block_offset));
}
- block_offset += b.size as u64;
+ block_offset += b.size;
}
let order_stream = OrderTag::stream();
diff --git a/src/api/s3/multipart.rs b/src/api/s3/multipart.rs
index ecd7a212..611cfd47 100644
--- a/src/api/s3/multipart.rs
+++ b/src/api/s3/multipart.rs
@@ -340,6 +340,7 @@ pub async fn handle_abort_multipart_upload(
// ======== helpers ============
+#[allow(clippy::ptr_arg)]
pub(crate) async fn get_upload(
garage: &Garage,
bucket_id: &Uuid,
@@ -347,13 +348,10 @@ pub(crate) async fn get_upload(
upload_id: &Uuid,
) -> Result<(Object, ObjectVersion, MultipartUpload), Error> {
let (object, mpu) = futures::try_join!(
- garage
- .object_table
- .get(&bucket_id, &key)
- .map_err(Error::from),
+ garage.object_table.get(bucket_id, key).map_err(Error::from),
garage
.mpu_table
- .get(&upload_id, &EmptyKey)
+ .get(upload_id, &EmptyKey)
.map_err(Error::from),
)?;