From d3870d09893fa9df2353ec702bc5bb356aee724a Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Sun, 19 Apr 2026 14:02:21 +0900 Subject: [PATCH] rmdir: remove collapsible_if --- src/uu/rmdir/src/rmdir.rs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs index 76fa12673..41e4d0c5c 100644 --- a/src/uu/rmdir/src/rmdir.rs +++ b/src/uu/rmdir/src/rmdir.rs @@ -152,22 +152,14 @@ const PERHAPS_EMPTY_CODES: &[i32] = &[ ]; fn dir_not_empty(error: &io::Error, path: &Path) -> bool { - if let Some(code) = error.raw_os_error() { - if NOT_EMPTY_CODES.contains(&code) { - return true; - } + error.raw_os_error().is_some_and(|code| { + NOT_EMPTY_CODES.contains(&code) // If --ignore-fail-on-non-empty is used then we want to ignore all errors // for non-empty directories, even if the error was e.g. because there's // no permission. So we do an additional check. - if PERHAPS_EMPTY_CODES.contains(&code) { - if let Ok(mut iterator) = read_dir(path) { - if iterator.next().is_some() { - return true; - } - } - } - } - false + || PERHAPS_EMPTY_CODES.contains(&code) + && read_dir(path).is_ok_and(|mut iter| iter.next().is_some()) + }) } #[derive(Clone, Copy, Debug)]