From 374a0f233c9ea890081d510bdbc6fb0bfca3d68d Mon Sep 17 00:00:00 2001 From: Daniel Carl Jones Date: Tue, 2 Jan 2024 11:03:03 +0000 Subject: [PATCH] Resolve clippy warnings introduced in Rust 1.75.0 (#686) * Appease clippy Making changes based on new clippy rules. Changes are seen for the following update: stable-x86_64-apple-darwin updated - rustc 1.75.0 (82e1608df 2023-12-21) (from rustc 1.74.1 (a28077b28 2023-12-04)) Signed-off-by: Daniel Carl Jones * Simplify tuple ref mapping Co-authored-by: Alessandro Passaro Signed-off-by: Daniel Carl Jones --------- Signed-off-by: Daniel Carl Jones Co-authored-by: Alessandro Passaro --- mountpoint-s3/src/inode.rs | 4 ++-- mountpoint-s3/tests/reftests/reference.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mountpoint-s3/src/inode.rs b/mountpoint-s3/src/inode.rs index bb761745a..c0a6f5183 100644 --- a/mountpoint-s3/src/inode.rs +++ b/mountpoint-s3/src/inode.rs @@ -711,14 +711,14 @@ impl SuperblockInner { let found_directory = if result .common_prefixes - .get(0) + .first() .map(|prefix| prefix.starts_with(&full_path_suffixed)) .unwrap_or(false) { true } else if result .objects - .get(0) + .first() .map(|object| object.key.starts_with(&full_path_suffixed)) .unwrap_or(false) { diff --git a/mountpoint-s3/tests/reftests/reference.rs b/mountpoint-s3/tests/reftests/reference.rs index 848b2c412..87d7c51fb 100644 --- a/mountpoint-s3/tests/reftests/reference.rs +++ b/mountpoint-s3/tests/reftests/reference.rs @@ -141,7 +141,7 @@ impl Reference { pub fn new(remote_keys: Vec<(String, MockObject)>) -> Self { let local_files = vec![]; let local_directories = vec![]; - let materialized = build_reference(remote_keys.iter().map(|(k, o)| (k, o))); + let materialized = build_reference(remote_keys.iter().map(|(k, o): &(_, _)| (k, o))); Self { remote_keys: remote_keys.into_iter().collect(), local_files,