diff options
| author | Alex <alex@adnab.me> | 2023-05-11 09:33:03 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-05-11 09:33:03 +0000 |
| commit | 375270afd19a8ce2aa3ff99bd0fc3ccab638c223 (patch) | |
| tree | 362189dcfde317ef4dd0613ab621684469c17168 /src/api/s3 | |
| parent | b925f53dc3b0bae77aa3f73e581faace2eb3b21a (diff) | |
| parent | c783194e8b8c3263fad579a85ea07d62e63b16be (diff) | |
| download | garage-375270afd19a8ce2aa3ff99bd0fc3ccab638c223.tar.gz garage-375270afd19a8ce2aa3ff99bd0fc3ccab638c223.zip | |
Merge pull request '*: apply clippy recommendations.' (#570) from jpds/garage:clippy-fixes into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/570
Diffstat (limited to 'src/api/s3')
| -rw-r--r-- | src/api/s3/get.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/api/s3/get.rs b/src/api/s3/get.rs index 2a99551a..cde7b461 100644 --- a/src/api/s3/get.rs +++ b/src/api/s3/get.rs @@ -443,7 +443,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() { @@ -454,7 +454,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(); |