From 412ab77b0815f165539fe41713c0155a9878672f Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 4 May 2023 19:44:01 +0200
Subject: comments and clippy lint fixes

---
 src/api/s3/get.rs       | 4 ++--
 src/api/s3/multipart.rs | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/api/s3')

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),
 	)?;
 
-- 
cgit v1.2.3