From 2dd9822d5709b0635ce0de836663e1d302c7ef17 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Fri, 11 Jun 2021 14:25:17 +0900
Subject: [PATCH] rmdir: clean up returning Err

---
 src/uu/rmdir/src/rmdir.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs
index 05cc66d51..fc22cca09 100644
--- a/src/uu/rmdir/src/rmdir.rs
+++ b/src/uu/rmdir/src/rmdir.rs
@@ -109,17 +109,14 @@ 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) => {
+    let mut read_dir = fs::read_dir(path).map_err(|e| {
+        if e.raw_os_error() == Some(ENOTDIR) {
             show_error!("failed to remove '{}': Not a directory", path.display());
-            return Err(1);
-        }
-        Err(e) => {
+        } else {
             show_error!("reading directory '{}': {}", path.display(), e);
-            return Err(1);
         }
-    };
+        1
+    })?;
 
     let mut r = Ok(());