remove wrong if branch and modify a test

Author: AnirbanHalder654322

.cargo/config.toml

@@ -3,11 +3,10 @@ linker = "x86_64-unknown-redox-gcc"
 
 [target.'cfg(clippy)']
 rustflags = [
-    "-Wclippy::use_self",
-    "-Wclippy::needless_pass_by_value",
-    "-Wclippy::semicolon_if_nothing_returned",
-    "-Wclippy::single_char_pattern",
-    "-Wclippy::explicit_iter_loop",
-    "-Wclippy::if_not_else",
+  "-Wclippy::use_self",
+  "-Wclippy::needless_pass_by_value",
+  "-Wclippy::semicolon_if_nothing_returned",
+  "-Wclippy::single_char_pattern",
+  "-Wclippy::explicit_iter_loop",
+  "-Wclippy::if_not_else",
 ]
-

Cargo.toml

@@ -337,6 +337,7 @@ thiserror = "1.0.59"
 time = { version = "0.3.36" }
 unicode-segmentation = "1.11.0"
 unicode-width = "0.1.12"
+utf-8 = "0.7.6"
 utmp-classic = "0.1.6"
 walkdir = "2.5"
 winapi-util = "0.1.8"

src/uu/rm/src/rm.rs

@@ -336,7 +336,7 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
     let path = clean_trailing_slashes(path);
     if path_is_current_or_parent_directory(path) {
         show_error!(
-            "refusing to remove '.' or '..' directory: skipping '{:}'",
+            "refusing to remove '.' or '..' directory: skipping '{}'",
             path.display()
         );
         return true;
@@ -412,17 +412,12 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
     } else if options.dir && (!is_root || !options.preserve_root) {
         had_err = remove_dir(path, options).bitor(had_err);
     } else if options.recursive {
-        if is_root || !options.preserve_root {
-            show_error!(
-                "it is dangerous to operate recursively on '{}'",
-                MAIN_SEPARATOR
-            );
-            show_error!("use --no-preserve-root to override this failsafe");
-            had_err = true;
-        } else {
-            show_error!("could not remove directory {}", path.quote());
-            had_err = true;
-        }
+        show_error!(
+            "it is dangerous to operate recursively on '{}'",
+            MAIN_SEPARATOR
+        );
+        show_error!("use --no-preserve-root to override this failsafe");
+        had_err = true;
     } else {
         show_error!(
             "cannot remove {}: Is a directory", // GNU's rm error message does not include help
@@ -584,7 +579,7 @@ fn handle_writable_directory(path: &Path, options: &Options, metadata: &Metadata
         true
     }
 }
-/// Checks if the path is referring to current or parent directory , if it is referring to current or any parent directory in the file tree e.g '/.....' , '....' . '../..'
+/// Checks if the path is referring to current or parent directory , if it is referring to current or any parent directory in the file tree e.g  '/../..' , '../..'
 fn path_is_current_or_parent_directory(path: &Path) -> bool {
     let path_str = os_str_as_bytes(path.as_os_str());
     let dir_separator = MAIN_SEPARATOR as u8;
@@ -684,3 +679,17 @@ fn is_symlink_dir(metadata: &Metadata) -> bool {
     metadata.file_type().is_symlink()
         && ((metadata.file_attributes() & FILE_ATTRIBUTE_DIRECTORY) != 0)
 }
+
+mod tests {
+
+    #[test]
+    // Testing whether path the `/////` collapses to `/`
+    fn test_collapsible_slash_path() {
+        use std::path::Path;
+
+        use crate::clean_trailing_slashes;
+        let path = Path::new("/////");
+
+        assert_eq!(Path::new("/"), clean_trailing_slashes(path));
+    }
+}

tests/by-util/test_rm.rs

@@ -319,22 +319,6 @@ fn test_rm_no_operand() {
     ts.ucmd().fails().usage_error("missing operand");
 }
 
-#[test]
-#[cfg(not(windows))]
-// Windows doesn't have a root directory like unix
-fn test_rm_only_slashes_acting_as_root() {
-    // We are testing the path '//////' which will be cleaned to be '/'.
-
-    let str_slashes = std::str::from_utf8(&[std::path::MAIN_SEPARATOR as u8; 6]).unwrap();
-
-    let ts = TestScenario::new(util_name!());
-    ts.ucmd()
-        .arg("-r")
-        .arg(str_slashes)
-        .fails()
-        .stderr_contains("it is dangerous to operate recursively on");
-}
-
 #[test]
 fn test_rm_verbose_slash() {
     let (at, mut ucmd) = at_and_ucmd!();