refactor(uu/rm): extract device skip logic into reusable function

Extract the logic for checking and skipping directories on different devices into a new `should_skip_different_device_with_dev` function. This refactoring improves code organization by consolidating the device check, error handling, and preserve-root logic into a single, reusable Unix-specific function, while providing a no-op for non-Unix platforms. The change maintains existing behavior but enhances maintainability.

Author: mattsu2020

src/uu/rm/src/platform/linux.rs

@@ -20,9 +20,9 @@ use uucore::show_error;
 use uucore::translate;
 
 use super::super::{
-    InteractiveMode, Options, RmError, is_dir_empty, is_readable_metadata, prompt_descend,
-    prompt_dir, prompt_file, remove_file, show_permission_denied_error, show_removal_error,
-    verbose_removed_directory, verbose_removed_file,
+    InteractiveMode, Options, is_dir_empty, is_readable_metadata, prompt_descend, prompt_dir,
+    prompt_file, remove_file, should_skip_different_device_with_dev, show_permission_denied_error,
+    show_removal_error, verbose_removed_directory, verbose_removed_file,
 };
 
 /// Whether the given file or directory is readable.
@@ -314,22 +314,16 @@ pub fn safe_remove_dir_recursive_impl(
         let is_dir = (entry_stat.st_mode & libc::S_IFMT) == libc::S_IFDIR;
 
         if is_dir {
-            if check_device {
-                if let Some(parent_dev_id) = parent_dev_id {
-                    if entry_stat.st_dev != parent_dev_id {
-                        show_error!(
-                            "{}",
-                            RmError::SkippingDirectoryOnDifferentDevice(
-                                entry_path.as_os_str().to_os_string()
-                            )
-                        );
-                        if options.preserve_root_all {
-                            show_error!("{}", RmError::PreserveRootAllInEffect);
-                        }
-                        error = true;
-                        continue;
-                    }
-                }
+            if check_device
+                && should_skip_different_device_with_dev(
+                    parent_dev_id,
+                    entry_stat.st_dev,
+                    options,
+                    &entry_path,
+                )
+            {
+                error = true;
+                continue;
             }
             // Ask user if they want to descend into this directory
             if options.interactive == InteractiveMode::Always

src/uu/rm/src/rm.rs

@@ -615,9 +615,29 @@ fn should_skip_different_device(
     metadata: &Metadata,
     options: &Options,
     path: &Path,
+) -> bool {
+    should_skip_different_device_with_dev(parent_dev_id, metadata.dev(), options, path)
+}
+
+#[cfg(not(unix))]
+fn should_skip_different_device(
+    _parent_dev_id: Option<u64>,
+    _metadata: &Metadata,
+    _options: &Options,
+    _path: &Path,
+) -> bool {
+    false
+}
+
+#[cfg(unix)]
+fn should_skip_different_device_with_dev(
+    parent_dev_id: Option<u64>,
+    dev_id: u64,
+    options: &Options,
+    path: &Path,
 ) -> bool {
     if let Some(parent_dev_id) = parent_dev_id {
-        if metadata.dev() != parent_dev_id {
+        if dev_id != parent_dev_id {
             show_error!(
                 "{}",
                 RmError::SkippingDirectoryOnDifferentDevice(path.as_os_str().to_os_string())
@@ -632,9 +652,9 @@ fn should_skip_different_device(
 }
 
 #[cfg(not(unix))]
-fn should_skip_different_device(
+fn should_skip_different_device_with_dev(
     _parent_dev_id: Option<u64>,
-    _metadata: &Metadata,
+    _dev_id: u64,
     _options: &Options,
     _path: &Path,
 ) -> bool {