Fixed #1769: rm: -d should match GNU's output

src/uu/rm/src/rm.rs

@@ -298,6 +298,7 @@ fn remove_dir(path: &Path, options: &Options) -> bool {
     } else {
         true
     };
+
     if response {
         match fs::remove_dir(path) {
             Ok(_) => {
@@ -306,7 +307,17 @@ fn remove_dir(path: &Path, options: &Options) -> bool {
                 }
             }
             Err(e) => {
-                show_error!("removing '{}': {}", path.display(), e);
+                if e.to_string().starts_with("Directory not empty")
+                    || (cfg!(windows) && e.to_string().starts_with("The directory is not empty"))
+                {
+                    let description = format!("cannot remove '{}'", path.display());
+                    let error_message = "Directory not empty";
+
+                    show_error_custom_description!(description, "{}", error_message);
+                } else {
+                    show_error!("removing '{}': {}", path.display(), e);
+                }
+
                 return true;
             }
         }

src/uucore/src/lib/macros.rs

@@ -26,6 +26,14 @@ macro_rules! show_error(
     })
 );
 
+#[macro_export]
+macro_rules! show_error_custom_description (
+    ($err:expr,$($args:tt)+) => ({
+        eprint!("{}: {}: ", executable!(), $err);
+        eprintln!($($args)+);
+    })
+);
+
 #[macro_export]
 macro_rules! show_warning(
     ($($args:tt)+) => ({

tests/by-util/test_rm.rs

@@ -152,6 +152,22 @@ fn test_rm_errors() {
     );
 }
 
+#[test]
+fn test_rm_dir_not_empty() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let dir = "test_rm_errors_directory";
+    let file = "test_rm_errors_directory/test_rm_errors_file";
+
+    at.mkdir(dir);
+    at.touch(file);
+
+    // rm: cannot remove 'test_rm_errors_directory': Directory not empty
+    ucmd.arg("-d")
+        .arg(dir)
+        .fails()
+        .stderr_is("rm: cannot remove 'test_rm_errors_directory': Directory not empty\n");
+}
+
 #[test]
 fn test_rm_verbose() {
     let (at, mut ucmd) = at_and_ucmd!();