Merge #1401

1401: cleanup: remove redundant unwrap in Dir::from_fd r=asomers a=scottlamb



Co-authored-by: Scott Lamb <slamb@slamb.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/dir.rs b/src/dir.rs
index a58af19c..7c35d70f 100644
--- a/src/dir.rs
+++ b/src/dir.rs
@@ -53,14 +53,12 @@ impl Dir {
 
     /// Converts from a file descriptor, closing it on success or failure.
     pub fn from_fd(fd: RawFd) -> Result<Self> {
-        let d = unsafe { libc::fdopendir(fd) };
-        if d.is_null() {
+        let d = ptr::NonNull::new(unsafe { libc::fdopendir(fd) }).ok_or_else(|| {
             let e = Error::last();
             unsafe { libc::close(fd) };
-            return Err(e);
-        };
-        // Always guaranteed to be non-null by the previous check
-        Ok(Dir(ptr::NonNull::new(d).unwrap()))
+            e
+        })?;
+        Ok(Dir(d))
     }
 
     /// Returns an iterator of `Result<Entry>` which rewinds when finished.