Skip to content

Commit 733284f

Browse files
committed
fmt
1 parent 02df2b1 commit 733284f

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/tools/miri/src/alloc/isolated_alloc.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use std::{alloc::Layout, ptr::NonNull};
1+
use std::alloc::Layout;
2+
use std::ptr::NonNull;
23

34
use nix::sys::mman;
45
use rustc_index::bit_set::DenseBitSet;

src/tools/miri/src/shims/native_lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
232232
let (ret, maybe_memevents) =
233233
this.call_native_with_args(link_name, dest, code_ptr, libffi_args)?;
234234

235-
if cfg!(target_os = "linux") && let Some(events) = maybe_memevents {
235+
if cfg!(target_os = "linux")
236+
&& let Some(events) = maybe_memevents
237+
{
236238
trace!("Registered FFI events:\n{events:#0x?}");
237239
}
238240

src/tools/miri/src/shims/trace/parent.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,11 +566,7 @@ fn handle_segfault(
566566

567567
// Check if we also own the next page, and if so unprotect it in case
568568
// the access spans the page boundary.
569-
let flag = if ch_pages.contains(&page_addr.strict_add(page_size)) {
570-
2
571-
} else {
572-
1
573-
};
569+
let flag = if ch_pages.contains(&page_addr.strict_add(page_size)) { 2 } else { 1 };
574570
ptrace::write(pid, (&raw const PAGE_COUNT).cast_mut().cast(), flag).unwrap();
575571

576572
ptrace::setregs(pid, new_regs).unwrap();

0 commit comments

Comments
 (0)