Use MAIN_SERPARATOR over manual conditional variable assignment

uutils · Sep 7, 2024 · b09f50e · b09f50e
1 parent cfc82c6
commit b09f50e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs
@@ -326,10 +326,7 @@ pub fn remove(files: &[&OsStr], options: &Options) -> bool {
 fn handle_dir(path: &Path, options: &Options) -> bool {
     let mut had_err = false;
 
-    #[cfg(unix)]
-    let del = "/";
-    #[cfg(windows)]
-    let del = "\\";
+    let del = std::path::MAIN_SEPARATOR;
 
     if path
         .to_str()

diff --git a/tests/by-util/test_rm.rs b/tests/by-util/test_rm.rs
@@ -718,10 +718,7 @@ fn test_non_utf8() {
 fn test_rm_no_del_parent() {
     let (at, mut ucmd) = at_and_ucmd!();
 
-    #[cfg(not(windows))]
-    let del = "/";
-    #[cfg(windows)]
-    let del = "\\";
+    let del = std::path::MAIN_SEPARATOR;
 
     at.mkdir("test");
     at.mkdir(&format!("test{del}dir"));
@@ -736,10 +733,7 @@ fn test_rm_no_del_parent() {
 fn test_rm_no_del_cur() {
     let (at, mut ucmd) = at_and_ucmd!();
 
-    #[cfg(not(windows))]
-    let del = "/";
-    #[cfg(windows)]
-    let del = "\\";
+    let del = std::path::MAIN_SEPARATOR;
 
     at.mkdir("test");
     at.touch(&format!("test{del}file"));