diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-03-14 12:00:23 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-03-14 12:27:49 +0100 |
| commit | ba6b56ae68d5842d814769418d484093865261aa (patch) | |
| tree | 2620aadaa46718680ba6e66946ca487839335f56 /src/garage/tests | |
| parent | 0af314b295f70fdf107524b08063f4d36fb4eeb6 (diff) | |
| download | garage-ba6b56ae68d5842d814769418d484093865261aa.tar.gz garage-ba6b56ae68d5842d814769418d484093865261aa.zip | |
Fix some new clippy lintsfix-resync
Diffstat (limited to 'src/garage/tests')
| -rw-r--r-- | src/garage/tests/bucket.rs | 4 | ||||
| -rw-r--r-- | src/garage/tests/list.rs | 4 | ||||
| -rw-r--r-- | src/garage/tests/multipart.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/garage/tests/bucket.rs b/src/garage/tests/bucket.rs index 1a534042..ff5cc8da 100644 --- a/src/garage/tests/bucket.rs +++ b/src/garage/tests/bucket.rs @@ -27,7 +27,7 @@ async fn test_bucket_all() { .buckets .as_ref() .unwrap() - .into_iter() + .iter() .filter(|x| x.name.as_ref().is_some()) .find(|x| x.name.as_ref().unwrap() == "hello") .is_some()); @@ -79,7 +79,7 @@ async fn test_bucket_all() { .buckets .as_ref() .unwrap() - .into_iter() + .iter() .filter(|x| x.name.as_ref().is_some()) .find(|x| x.name.as_ref().unwrap() == "hello") .is_none()); diff --git a/src/garage/tests/list.rs b/src/garage/tests/list.rs index 6e092a3f..bb03f250 100644 --- a/src/garage/tests/list.rs +++ b/src/garage/tests/list.rs @@ -527,8 +527,8 @@ async fn test_listmultipart() { upnext = r.next_upload_id_marker; loopcnt += 1; - upcnt += r.uploads.unwrap_or(vec![]).len(); - pfxcnt += r.common_prefixes.unwrap_or(vec![]).len(); + upcnt += r.uploads.unwrap_or_default().len(); + pfxcnt += r.common_prefixes.unwrap_or_default().len(); if next.is_none() { break; diff --git a/src/garage/tests/multipart.rs b/src/garage/tests/multipart.rs index 095c9d34..7fec4de6 100644 --- a/src/garage/tests/multipart.rs +++ b/src/garage/tests/multipart.rs @@ -124,7 +124,7 @@ async fn test_uploadlistpart() { assert!(r.part_number_marker.is_none()); assert!(r.next_part_number_marker.is_some()); - assert_eq!(r.max_parts, 1 as i32); + assert_eq!(r.max_parts, 1_i32); assert!(r.is_truncated); assert_eq!(r.key.unwrap(), "a"); assert_eq!(r.upload_id.unwrap().as_str(), uid.as_str()); @@ -146,7 +146,7 @@ async fn test_uploadlistpart() { r2.part_number_marker.as_ref().unwrap(), r.next_part_number_marker.as_ref().unwrap() ); - assert_eq!(r2.max_parts, 1 as i32); + assert_eq!(r2.max_parts, 1_i32); assert!(r2.is_truncated); assert_eq!(r2.key.unwrap(), "a"); assert_eq!(r2.upload_id.unwrap().as_str(), uid.as_str()); |