From 5872d24021d537d6616d61586bb1b5fc3dc9bf45 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Mon, 13 May 2024 14:30:09 +0200 Subject: [PATCH] Clippy for apple after #2162 (#2166) --- libafl_bolts/src/minibsod.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libafl_bolts/src/minibsod.rs b/libafl_bolts/src/minibsod.rs index bf8ebcda3a..1e5e3eb423 100644 --- a/libafl_bolts/src/minibsod.rs +++ b/libafl_bolts/src/minibsod.rs @@ -3,13 +3,22 @@ //! You may use the [`crate::os::unix_signals::ucontext`] //! function to get a [`ucontext_t`]. +#[cfg(target_vendor = "apple")] +use core::mem::size_of; use std::io::{BufWriter, Write}; #[cfg(any(target_os = "solaris", target_os = "illumos"))] use std::process::Command; -#[cfg(target_vendor = "apple")] -extern crate mach; use libc::siginfo_t; +#[cfg(target_vendor = "apple")] +use mach::{ + message::mach_msg_type_number_t, + port::mach_port_t, + traps::mach_task_self, + vm::mach_vm_region_recurse, + vm_region::{vm_region_recurse_info_t, vm_region_submap_info_64}, + vm_types::{mach_vm_address_t, mach_vm_size_t, natural_t}, +}; use crate::os::unix_signals::{ucontext_t, Signal}; @@ -889,10 +898,6 @@ fn write_minibsod(writer: &mut BufWriter) -> Result<(), std::io::Er #[cfg(target_vendor = "apple")] #[allow(non_camel_case_types)] fn write_minibsod(writer: &mut BufWriter) -> Result<(), std::io::Error> { - use core::mem::size_of; - - use mach::{message::*, port::*, traps::*, vm::*, vm_region::*, vm_types::*}; - let mut ptask = std::mem::MaybeUninit::::uninit(); // We start by the lowest virtual address from the userland' standpoint let mut addr: mach_vm_address_t = 0;