diff --git a/src/tools/miri/src/alloc/isolated_alloc.rs b/src/tools/miri/src/alloc/isolated_alloc.rs index 0b3218832b61..ef3dd9823371 100644 --- a/src/tools/miri/src/alloc/isolated_alloc.rs +++ b/src/tools/miri/src/alloc/isolated_alloc.rs @@ -1,4 +1,5 @@ -use std::{alloc::Layout, ptr::NonNull}; +use std::alloc::Layout; +use std::ptr::NonNull; use nix::sys::mman; use rustc_index::bit_set::DenseBitSet; diff --git a/src/tools/miri/src/shims/native_lib.rs b/src/tools/miri/src/shims/native_lib.rs index 033e4f367162..3e455e17386c 100644 --- a/src/tools/miri/src/shims/native_lib.rs +++ b/src/tools/miri/src/shims/native_lib.rs @@ -232,7 +232,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { let (ret, maybe_memevents) = this.call_native_with_args(link_name, dest, code_ptr, libffi_args)?; - if cfg!(target_os = "linux") && let Some(events) = maybe_memevents { + if cfg!(target_os = "linux") + && let Some(events) = maybe_memevents + { trace!("Registered FFI events:\n{events:#0x?}"); } diff --git a/src/tools/miri/src/shims/trace/parent.rs b/src/tools/miri/src/shims/trace/parent.rs index 84ea6a10061d..cb9a9fc8da5b 100644 --- a/src/tools/miri/src/shims/trace/parent.rs +++ b/src/tools/miri/src/shims/trace/parent.rs @@ -566,11 +566,7 @@ fn handle_segfault( // Check if we also own the next page, and if so unprotect it in case // the access spans the page boundary. - let flag = if ch_pages.contains(&page_addr.strict_add(page_size)) { - 2 - } else { - 1 - }; + let flag = if ch_pages.contains(&page_addr.strict_add(page_size)) { 2 } else { 1 }; ptrace::write(pid, (&raw const PAGE_COUNT).cast_mut().cast(), flag).unwrap(); ptrace::setregs(pid, new_regs).unwrap();