Skip to content

Commit c0ea01b

Browse files
committed
Fixed formatting using rustfmt
1 parent 68a1530 commit c0ea01b

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

src/bin/miri.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,12 @@ fn main() {
327327
let action = match arg.strip_prefix("-Zmiri-isolated-op=").unwrap() {
328328
"hide" => miri::IsolatedOp::Reject(miri::RejectOpWith::NoWarning),
329329
"warn" => miri::IsolatedOp::Reject(miri::RejectOpWith::Warning),
330-
"warn-nobacktrace" => miri::IsolatedOp::Reject(miri::RejectOpWith::WarningWithoutBacktrace),
330+
"warn-nobacktrace" =>
331+
miri::IsolatedOp::Reject(miri::RejectOpWith::WarningWithoutBacktrace),
331332
"allow" => miri::IsolatedOp::Allow,
332-
_ => panic!("-Zmiri-isolated-op must be `hide`, `warn`, `warn-nobacktrace`, or `allow`"),
333-
333+
_ => panic!(
334+
"-Zmiri-isolated-op must be `hide`, `warn`, `warn-nobacktrace`, or `allow`"
335+
),
334336
};
335337
miri_config.isolated_op = action;
336338
}

src/diagnostics.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -290,22 +290,17 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
290290
CreatedCallId(id) => format!("function call with id {}", id),
291291
CreatedAlloc(AllocId(id)) => format!("created allocation with id {}", id),
292292
FreedAlloc(AllocId(id)) => format!("freed allocation with id {}", id),
293-
RejectedIsolatedOp(ref op) => format!("`{}` was made to return an error due to isolation", op),
293+
RejectedIsolatedOp(ref op) =>
294+
format!("`{}` was made to return an error due to isolation", op),
294295
};
295296

296297
let (title, diag_level) = match e {
297-
RejectedIsolatedOp(_) => ("operation rejected by isolation", DiagLevel::Warning),
298+
RejectedIsolatedOp(_) =>
299+
("operation rejected by isolation", DiagLevel::Warning),
298300
_ => ("tracking was triggered", DiagLevel::Note),
299301
};
300302

301-
report_msg(
302-
*this.tcx,
303-
diag_level,
304-
title,
305-
msg,
306-
vec![],
307-
&stacktrace,
308-
);
303+
report_msg(*this.tcx, diag_level, title, msg, vec![], &stacktrace);
309304
}
310305
});
311306
}

src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ pub use crate::diagnostics::{
5757
register_diagnostic, report_error, EvalContextExt as DiagnosticsEvalContextExt,
5858
NonHaltingDiagnostic, TerminationInfo,
5959
};
60-
pub use crate::eval::{create_ecx, eval_main, AlignmentCheck, IsolatedOp, MiriConfig, RejectOpWith};
60+
pub use crate::eval::{
61+
create_ecx, eval_main, AlignmentCheck, IsolatedOp, MiriConfig, RejectOpWith,
62+
};
6163
pub use crate::helpers::EvalContextExt as HelpersEvalContextExt;
6264
pub use crate::machine::{
6365
AllocExtra, Evaluator, FrameData, MemoryExtra, MiriEvalContext, MiriEvalContextExt,

src/shims/env.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
355355
) -> InterpResult<'tcx, u32> {
356356
let this = self.eval_context_mut();
357357
this.assert_target_os("windows", "GetCurrentDirectoryW");
358-
358+
359359
match this.machine.isolated_op {
360360
IsolatedOp::Allow => {
361361
let size = u64::from(this.read_scalar(size_op)?.to_u32()?);
@@ -364,7 +364,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
364364
// If we cannot get the current directory, we return 0
365365
match env::current_dir() {
366366
Ok(cwd) =>
367-
return Ok(windows_check_buffer_size(this.write_path_to_wide_str(&cwd, buf, size)?)),
367+
return Ok(windows_check_buffer_size(
368+
this.write_path_to_wide_str(&cwd, buf, size)?,
369+
)),
368370
Err(e) => this.set_last_error_from_io_error(e)?,
369371
}
370372
}
@@ -419,7 +421,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
419421

420422
match this.machine.isolated_op {
421423
IsolatedOp::Allow => {
422-
let path = this.read_path_from_wide_str(this.read_scalar(path_op)?.check_init()?)?;
424+
let path =
425+
this.read_path_from_wide_str(this.read_scalar(path_op)?.check_init()?)?;
423426

424427
match env::set_current_dir(path) {
425428
Ok(()) => Ok(1),

0 commit comments

Comments
 (0)