diff --git a/src/api/s3/list.rs b/src/api/s3/list.rs index 0d19fda6..3772aad9 100644 --- a/src/api/s3/list.rs +++ b/src/api/s3/list.rs @@ -598,7 +598,7 @@ impl ListObjectsQuery { Some("[") => Ok(RangeBegin::IncludingKey { key: String::from_utf8( BASE64_STANDARD - .decode(token[1..].as_bytes()) + .decode(&token.as_bytes()[1..]) .ok_or_bad_request("Invalid continuation token")?, )?, fallback_key: None, @@ -606,7 +606,7 @@ impl ListObjectsQuery { Some("]") => Ok(RangeBegin::AfterKey { key: String::from_utf8( BASE64_STANDARD - .decode(token[1..].as_bytes()) + .decode(&token.as_bytes()[1..]) .ok_or_bad_request("Invalid continuation token")?, )?, }), @@ -1043,7 +1043,7 @@ mod tests { #[test] fn test_extract_upload() { - let objs = vec![ + let objs = [ Object::new( bucket(), "b".to_string(), diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs index bac5a678..588b6aa7 100644 --- a/src/api/s3/put.rs +++ b/src/api/s3/put.rs @@ -668,7 +668,7 @@ pub(crate) fn extract_metadata_headers( let mut ret = Vec::new(); // Preserve standard headers - let standard_header = vec![ + let standard_header = [ hyper::header::CONTENT_TYPE, hyper::header::CACHE_CONTROL, hyper::header::CONTENT_DISPOSITION, diff --git a/src/block/manager.rs b/src/block/manager.rs index b84cb9d1..0a7b55dd 100644 --- a/src/block/manager.rs +++ b/src/block/manager.rs @@ -173,7 +173,7 @@ impl BlockManager { data_fsync: config.data_fsync, disable_scrub: config.disable_scrub, compression_level: config.compression_level, - mutation_lock: vec![(); MUTEX_COUNT] + mutation_lock: [(); MUTEX_COUNT] .iter() .map(|_| Mutex::new(BlockManagerLocked())) .collect::>(), diff --git a/src/garage/tests/s3/multipart.rs b/src/garage/tests/s3/multipart.rs index cc424f59..cd1c754a 100644 --- a/src/garage/tests/s3/multipart.rs +++ b/src/garage/tests/s3/multipart.rs @@ -314,7 +314,7 @@ async fn test_multipart_with_checksum() { .build(); let expected_checksum = calculate_sha1( - &vec![ + &[ BASE64_STANDARD.decode(&ck1).unwrap(), BASE64_STANDARD.decode(&ck2).unwrap(), BASE64_STANDARD.decode(&ck3).unwrap(), diff --git a/src/garage/tests/s3/ssec.rs b/src/garage/tests/s3/ssec.rs index d8f11950..9f3339f7 100644 --- a/src/garage/tests/s3/ssec.rs +++ b/src/garage/tests/s3/ssec.rs @@ -19,7 +19,7 @@ async fn test_ssec_object() { .map(|x| ((x * 3792) % 256) as u8) .collect::>(); - for data in vec![bytes1, bytes2] { + for data in [bytes1, bytes2] { let stream = ByteStream::new(data.clone().into()); // Write encrypted object