diff --git a/libafl/src/bolts/launcher.rs b/libafl/src/bolts/launcher.rs index 48721f77d2..8ca869852a 100644 --- a/libafl/src/bolts/launcher.rs +++ b/libafl/src/bolts/launcher.rs @@ -10,7 +10,6 @@ //! On `Unix` systems, the [`Launcher`] will use `fork` if the `fork` feature is used for `LibAFL`. //! Else, it will start subsequent nodes with the same commandline, and will set special `env` variables accordingly. -#[cfg(all(feature = "std"))] use alloc::string::ToString; #[cfg(feature = "std")] use core::marker::PhantomData; diff --git a/libafl_frida/src/asan/hook_funcs.rs b/libafl_frida/src/asan/hook_funcs.rs index fba362a021..460144da1e 100644 --- a/libafl_frida/src/asan/hook_funcs.rs +++ b/libafl_frida/src/asan/hook_funcs.rs @@ -165,7 +165,7 @@ impl AsanRuntime { } #[inline] - #[cfg(all(not(target_vendor = "apple")))] + #[cfg(not(target_vendor = "apple"))] pub fn hook_malloc_usable_size(&mut self, ptr: *mut c_void) -> usize { self.allocator_mut().get_usable_size(ptr) } @@ -583,7 +583,7 @@ impl AsanRuntime { unsafe { memmem(haystack, haystacklen, needle, needlelen) } } - #[cfg(all(not(target_os = "android")))] + #[cfg(not(target_os = "android"))] #[inline] pub fn hook_bzero(&mut self, s: *mut c_void, n: usize) { extern "C" { @@ -619,7 +619,7 @@ impl AsanRuntime { unsafe { explicit_bzero(s, n) } } - #[cfg(all(not(target_os = "android")))] + #[cfg(not(target_os = "android"))] #[inline] pub fn hook_bcmp(&mut self, s1: *const c_void, s2: *const c_void, n: usize) -> i32 { extern "C" { diff --git a/libafl_frida/src/helper.rs b/libafl_frida/src/helper.rs index 340a8ed76e..108f2de611 100644 --- a/libafl_frida/src/helper.rs +++ b/libafl_frida/src/helper.rs @@ -32,7 +32,7 @@ use crate::coverage_rt::CoverageRuntime; #[cfg(unix)] use crate::{asan::asan_rt::AsanRuntime, drcov_rt::DrCovRuntime}; -#[cfg(any(target_vendor = "apple"))] +#[cfg(target_vendor = "apple")] const ANONYMOUS_FLAG: MapFlags = MapFlags::MAP_ANON; #[cfg(not(any(target_vendor = "apple", target_os = "windows")))] const ANONYMOUS_FLAG: MapFlags = MapFlags::MAP_ANONYMOUS; diff --git a/libafl_frida/src/lib.rs b/libafl_frida/src/lib.rs index cfe1ecd36e..fb5939e4de 100644 --- a/libafl_frida/src/lib.rs +++ b/libafl_frida/src/lib.rs @@ -77,7 +77,7 @@ pub mod windows_hooks; pub mod coverage_rt; /// Hooking thread lifecycle events. Seems like this is apple-only for now. -#[cfg(any(target_vendor = "apple"))] +#[cfg(target_vendor = "apple")] pub mod pthread_hook; #[cfg(feature = "cmplog")]