From 3913731222ce263b3deb3991bfd36668eac610c2 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Sun, 30 May 2021 09:55:02 +0200
Subject: [PATCH] Revert "rmdir: match GNU error output"

---
 src/uu/rmdir/src/rmdir.rs   |  7 -------
 tests/by-util/test_rmdir.rs | 16 ----------------
 2 files changed, 23 deletions(-)

diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs
index 6b6db0b65..7a7e8fc9b 100644
--- a/src/uu/rmdir/src/rmdir.rs
+++ b/src/uu/rmdir/src/rmdir.rs
@@ -20,8 +20,6 @@ static OPT_VERBOSE: &str = "verbose";
 
 static ARG_DIRS: &str = "dirs";
 
-static ENOTDIR: i32 = 20;
-
 fn get_usage() -> String {
     format!("{0} [OPTION]... DIRECTORY...", executable!())
 }
@@ -107,11 +105,6 @@ fn remove(dirs: Vec<String>, ignore: bool, parents: bool, verbose: bool) -> Resu
 fn remove_dir(path: &Path, ignore: bool, verbose: bool) -> Result<(), i32> {
     let mut read_dir = match fs::read_dir(path) {
         Ok(m) => m,
-        Err(e) if e.raw_os_error() == Some(ENOTDIR) => {
-        // To match the GNU output
-            show_error!("failed to remove '{}': Not a directory", path.display());
-            return Err(1);
-        }
         Err(e) => {
             show_error!("reading directory '{}': {}", path.display(), e);
             return Err(1);
diff --git a/tests/by-util/test_rmdir.rs b/tests/by-util/test_rmdir.rs
index 4b74b2522..eef2d50f5 100644
--- a/tests/by-util/test_rmdir.rs
+++ b/tests/by-util/test_rmdir.rs
@@ -108,19 +108,3 @@ fn test_rmdir_ignore_nonempty_directory_with_parents() {
 
     assert!(at.dir_exists(dir));
 }
-
-#[test]
-fn test_rmdir_remove_symlink_match_gnu_error() {
-    let (at, mut ucmd) = at_and_ucmd!();
-
-    let file = "file";
-    let fl = "fl";
-    at.touch(file);
-    assert!(at.file_exists(file));
-    at.symlink_file(file, fl);
-    assert!(at.file_exists(fl));
-
-    ucmd.arg("fl/")
-        .fails()
-        .stderr_is("rmdir: failed to remove 'fl/': Not a directory");
-}