From 4a9635427605e993039068615a6905912d7d9fe4 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Thu, 24 Aug 2023 20:41:44 +0100 Subject: [PATCH] bolts: fix netbsd/openbsd clippy (#1459) --- libafl_bolts/src/core_affinity.rs | 6 ++---- libafl_bolts/src/minibsod.rs | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libafl_bolts/src/core_affinity.rs b/libafl_bolts/src/core_affinity.rs index d67eada672..0b43718fb4 100644 --- a/libafl_bolts/src/core_affinity.rs +++ b/libafl_bolts/src/core_affinity.rs @@ -790,8 +790,7 @@ mod netbsd { #[allow(trivial_numeric_casts)] pub fn get_core_ids() -> Result, Error> { Ok((0..(usize::from(available_parallelism()?))) - .into_iter() - .map(|n| CoreId(n)) + .map(CoreId) .collect::>()) } @@ -845,8 +844,7 @@ mod openbsd { #[allow(trivial_numeric_casts)] pub fn get_core_ids() -> Result, Error> { Ok((0..(usize::from(available_parallelism()?))) - .into_iter() - .map(|n| CoreId(n)) + .map(CoreId) .collect::>()) } } diff --git a/libafl_bolts/src/minibsod.rs b/libafl_bolts/src/minibsod.rs index 5359b716df..71fbcad5a1 100644 --- a/libafl_bolts/src/minibsod.rs +++ b/libafl_bolts/src/minibsod.rs @@ -642,7 +642,9 @@ fn write_minibsod(writer: &mut BufWriter) -> Result<(), std::io::Er libc::VM_PROC, libc::VM_PROC_MAP, -1, - std::mem::size_of::() as i32, + std::mem::size_of::() + .try_into() + .expect("Invalid libc::kinfo_vmentry size"), ]; let mib = arr.as_ptr(); let miblen = arr.len() as u32; @@ -737,7 +739,7 @@ fn write_minibsod(writer: &mut BufWriter) -> Result<(), std::io::Er } // OpenBSD's vm mappings have no knowledge of their paths on disk let i = format!("{}-{}\n", entry.kve_start, entry.kve_end); - writer.write(&i.into_bytes())?; + writer.write_all(&i.into_bytes())?; entry.kve_start = entry.kve_start + 1; } }