Minor code formatting

Author: atsmtat

src/bin/miri.rs

@@ -294,7 +294,7 @@ fn main() {
                     miri_config.check_abi = false;
                 }
                 "-Zmiri-disable-isolation" => {
-                    if let Some(true) = isolation_enabled {
+                    if matches!(isolation_enabled, Some(true) ) {
                         panic!(
                             "-Zmiri-disable-isolation cannot be used along with -Zmiri-isolation-error"
                         );
@@ -304,7 +304,7 @@ fn main() {
                     miri_config.isolated_op = miri::IsolatedOp::Allow;
                 }
                 arg if arg.starts_with("-Zmiri-isolation-error=") => {
-                    if let Some(false) = isolation_enabled {
+                    if matches!(isolation_enabled, Some(false)) {
                         panic!(
                             "-Zmiri-isolation-error cannot be used along with -Zmiri-disable-isolation"
                         );

src/shims/env.rs

@@ -326,20 +326,21 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             this.reject_in_isolation("getcwd", reject_with)?;
             let err = Error::new(ErrorKind::NotFound, "rejected due to isolation");
             this.set_last_error_from_io_error(err)?;
-        } else {
-            let buf = this.read_scalar(&buf_op)?.check_init()?;
-            let size = this.read_scalar(&size_op)?.to_machine_usize(&*this.tcx)?;
-            // If we cannot get the current directory, we return null
-            match env::current_dir() {
-                Ok(cwd) => {
-                    if this.write_path_to_c_str(&cwd, buf, size)?.0 {
-                        return Ok(buf);
-                    }
-                    let erange = this.eval_libc("ERANGE")?;
-                    this.set_last_error(erange)?;
+            return Ok(Scalar::null_ptr(&*this.tcx));
+        } 
+
+        let buf = this.read_scalar(&buf_op)?.check_init()?;
+        let size = this.read_scalar(&size_op)?.to_machine_usize(&*this.tcx)?;
+        // If we cannot get the current directory, we return null
+        match env::current_dir() {
+            Ok(cwd) => {
+                if this.write_path_to_c_str(&cwd, buf, size)?.0 {
+                    return Ok(buf);
                 }
-                Err(e) => this.set_last_error_from_io_error(e)?,
+                let erange = this.eval_libc("ERANGE")?;
+                this.set_last_error(erange)?;
             }
+            Err(e) => this.set_last_error_from_io_error(e)?,
         }
 
         Ok(Scalar::null_ptr(&*this.tcx))
@@ -358,18 +359,19 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             this.reject_in_isolation("GetCurrentDirectoryW", reject_with)?;
             let err = Error::new(ErrorKind::NotFound, "rejected due to isolation");
             this.set_last_error_from_io_error(err)?;
-        } else {
-            let size = u64::from(this.read_scalar(size_op)?.to_u32()?);
-            let buf = this.read_scalar(buf_op)?.check_init()?;
-
-            // If we cannot get the current directory, we return 0
-            match env::current_dir() {
-                Ok(cwd) =>
-                    return Ok(windows_check_buffer_size(
-                        this.write_path_to_wide_str(&cwd, buf, size)?,
-                    )),
-                Err(e) => this.set_last_error_from_io_error(e)?,
-            }
+            return Ok(0);
+        }
+
+        let size = u64::from(this.read_scalar(size_op)?.to_u32()?);
+        let buf = this.read_scalar(buf_op)?.check_init()?;
+
+        // If we cannot get the current directory, we return 0
+        match env::current_dir() {
+            Ok(cwd) =>
+                return Ok(windows_check_buffer_size(
+                    this.write_path_to_wide_str(&cwd, buf, size)?,
+                )),
+            Err(e) => this.set_last_error_from_io_error(e)?,
         }
         Ok(0)
     }
@@ -387,16 +389,16 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             let err = Error::new(ErrorKind::NotFound, "rejected due to isolation");
             this.set_last_error_from_io_error(err)?;
 
-            Ok(-1)
-        } else {
-            let path = this.read_path_from_c_str(this.read_scalar(path_op)?.check_init()?)?;
+            return Ok(-1);
+        }
 
-            match env::set_current_dir(path) {
-                Ok(()) => Ok(0),
-                Err(e) => {
-                    this.set_last_error_from_io_error(e)?;
-                    Ok(-1)
-                }
+        let path = this.read_path_from_c_str(this.read_scalar(path_op)?.check_init()?)?;
+
+        match env::set_current_dir(path) {
+            Ok(()) => Ok(0),
+            Err(e) => {
+                this.set_last_error_from_io_error(e)?;
+                Ok(-1)
             }
         }
     }
@@ -416,16 +418,16 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             let err = Error::new(ErrorKind::NotFound, "rejected due to isolation");
             this.set_last_error_from_io_error(err)?;
 
-            Ok(0)
-        } else {
-            let path = this.read_path_from_wide_str(this.read_scalar(path_op)?.check_init()?)?;
+            return Ok(0);
+        } 
 
-            match env::set_current_dir(path) {
-                Ok(()) => Ok(1),
-                Err(e) => {
-                    this.set_last_error_from_io_error(e)?;
-                    Ok(0)
-                }
+        let path = this.read_path_from_wide_str(this.read_scalar(path_op)?.check_init()?)?;
+
+        match env::set_current_dir(path) {
+            Ok(()) => Ok(1),
+            Err(e) => {
+                this.set_last_error_from_io_error(e)?;
+                Ok(0)
             }
         }
     }