Rollup merge of rust-lang#84712 - joshtriplett:simplify-chdir, r=yaahc

Simplify chdir implementation and minimize unsafe block
Dylan-DPC-zz · May 4, 2021 · a1a0e8c · a1a0e8c
2 parents 0f0b7c7 + 8a2e67e
commit a1a0e8c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/library/std/src/sys/unix/os.rs b/library/std/src/sys/unix/os.rs
@@ -155,12 +155,10 @@ pub fn getcwd() -> io::Result<PathBuf> {
 pub fn chdir(p: &path::Path) -> io::Result<()> {
     let p: &OsStr = p.as_ref();
     let p = CString::new(p.as_bytes())?;
-    unsafe {
-        match libc::chdir(p.as_ptr()) == (0 as c_int) {
-            true => Ok(()),
-            false => Err(io::Error::last_os_error()),
-        }
+    if unsafe { libc::chdir(p.as_ptr()) } != 0 {
+        return Err(io::Error::last_os_error());
     }
+    Ok(())
 }
 
 pub struct SplitPaths<'a> {