From 0db870399cf5ccfdc1ff2f18a9aae07e9c36c0b3 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 30 Sep 2025 09:36:41 +0200 Subject: [PATCH 1/2] clippy: re-enable semicolon_if_nothing_returned --- Cargo.toml | 1 - src/uucore/src/lib/features/checksum.rs | 2 +- src/uucore/src/lib/features/fast_inc.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a8bc90b5f..c97d47855 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -697,7 +697,6 @@ bool_to_int_with_if = "allow" needless_raw_string_hashes = "allow" unreadable_literal = "allow" unnested_or_patterns = "allow" -semicolon_if_nothing_returned = "allow" implicit_hasher = "allow" struct_field_names = "allow" doc_link_with_quotes = "allow" diff --git a/src/uucore/src/lib/features/checksum.rs b/src/uucore/src/lib/features/checksum.rs index 4a496e24f..86e1f54f0 100644 --- a/src/uucore/src/lib/features/checksum.rs +++ b/src/uucore/src/lib/features/checksum.rs @@ -1645,7 +1645,7 @@ mod tests { for (filename, result, prefix, expected) in cases { let mut buffer: Vec = vec![]; print_file_report(&mut buffer, filename, *result, prefix, opts.verbose); - assert_eq!(&buffer, expected) + assert_eq!(&buffer, expected); } } } diff --git a/src/uucore/src/lib/features/fast_inc.rs b/src/uucore/src/lib/features/fast_inc.rs index 165cf273f..48474344a 100644 --- a/src/uucore/src/lib/features/fast_inc.rs +++ b/src/uucore/src/lib/features/fast_inc.rs @@ -62,7 +62,7 @@ pub fn fast_inc(val: &mut [u8], start: &mut usize, end: usize, inc: &[u8]) { return; } - fast_inc_one(val, start, pos) + fast_inc_one(val, start, pos); } /// Fast increment by one function, operating on ASCII strings. From 9b8e31a685c5851e35f2b3095c8adf617505af9a Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 30 Sep 2025 09:39:20 +0200 Subject: [PATCH 2/2] uucore/perms: return value from if/else chain --- src/uucore/src/lib/features/perms.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs index 89b6d2f62..f915d13dc 100644 --- a/src/uucore/src/lib/features/perms.rs +++ b/src/uucore/src/lib/features/perms.rs @@ -742,13 +742,14 @@ pub fn configure_symlink_and_recursion( None // Default behavior }; - let mut traverse_symlinks = default_traverse_symlinks; - if matches.get_flag("L") { - traverse_symlinks = TraverseSymlinks::All + let mut traverse_symlinks = if matches.get_flag("L") { + TraverseSymlinks::All } else if matches.get_flag("H") { - traverse_symlinks = TraverseSymlinks::First + TraverseSymlinks::First } else if matches.get_flag("P") { - traverse_symlinks = TraverseSymlinks::None + TraverseSymlinks::None + } else { + default_traverse_symlinks }; let recursive = matches.get_flag(options::RECURSIVE);