Skip to content

Commit 24884f6

Browse files
committed
Fix formatting using rustfmt.
1 parent 4fd0bc7 commit 24884f6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ fn main() {
294294
miri_config.check_abi = false;
295295
}
296296
"-Zmiri-disable-isolation" => {
297-
if matches!(isolation_enabled, Some(true) ) {
297+
if matches!(isolation_enabled, Some(true)) {
298298
panic!(
299299
"-Zmiri-disable-isolation cannot be used along with -Zmiri-isolation-error"
300300
);

src/helpers.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
404404
match reject_with {
405405
RejectOpWith::Abort => isolation_abort_error(op_name),
406406
RejectOpWith::WarningWithoutBacktrace => {
407-
this.tcx.sess.warn(&format!("`{}` was made to return an error due to isolation", op_name));
407+
this.tcx
408+
.sess
409+
.warn(&format!("`{}` was made to return an error due to isolation", op_name));
408410
Ok(())
409411
}
410412
RejectOpWith::Warning => {

src/shims/env.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
327327
let err = Error::new(ErrorKind::NotFound, "rejected due to isolation");
328328
this.set_last_error_from_io_error(err)?;
329329
return Ok(Scalar::null_ptr(&*this.tcx));
330-
}
330+
}
331331

332332
let buf = this.read_scalar(&buf_op)?.check_init()?;
333333
let size = this.read_scalar(&size_op)?.to_machine_usize(&*this.tcx)?;
@@ -368,9 +368,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
368368
// If we cannot get the current directory, we return 0
369369
match env::current_dir() {
370370
Ok(cwd) =>
371-
return Ok(windows_check_buffer_size(
372-
this.write_path_to_wide_str(&cwd, buf, size)?,
373-
)),
371+
return Ok(windows_check_buffer_size(this.write_path_to_wide_str(&cwd, buf, size)?)),
374372
Err(e) => this.set_last_error_from_io_error(e)?,
375373
}
376374
Ok(0)
@@ -419,7 +417,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
419417
this.set_last_error_from_io_error(err)?;
420418

421419
return Ok(0);
422-
}
420+
}
423421

424422
let path = this.read_path_from_wide_str(this.read_scalar(path_op)?.check_init()?)?;
425423

0 commit comments

Comments
 (0)