From 117741e1b1a8a586d868d2380c8b0ed7c48e174c Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Mon, 20 May 2024 02:58:42 +0200 Subject: [PATCH] Run Clippy on macOS (#2222) * macos clippy * Fix clippy on macOS --- .github/workflows/build_and_test.yml | 2 ++ libafl_qemu/libafl_qemu_sys/build.rs | 4 ++++ libafl_qemu/libafl_qemu_sys/build_linux.rs | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 303143f7a1..a455a04e24 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -527,6 +527,8 @@ jobs: run: ./scripts/shmem_limits_macos.sh - name: Run Tests run: cargo test + - name: Clippy + run: cargo +nightly clippy --tests --all ios: runs-on: macOS-latest diff --git a/libafl_qemu/libafl_qemu_sys/build.rs b/libafl_qemu/libafl_qemu_sys/build.rs index b6cd28a0b2..6ad3e59ab1 100644 --- a/libafl_qemu/libafl_qemu_sys/build.rs +++ b/libafl_qemu/libafl_qemu_sys/build.rs @@ -20,6 +20,10 @@ fn nightly() {} fn main() { println!("cargo:rustc-check-cfg=cfg(nightly)"); + println!(r#"cargo::rustc-check-cfg=cfg(emulation_mode, values("usermode", "systemmode"))"#); + println!( + r#"cargo::rustc-check-cfg=cfg(cpu_target, values("arm", "aarch64", "hexagon", "i386", "mips", "ppc", "x86_64"))"# + ); nightly(); host_specific::build(); } diff --git a/libafl_qemu/libafl_qemu_sys/build_linux.rs b/libafl_qemu/libafl_qemu_sys/build_linux.rs index 7fc92c4fe7..ab80aeafd2 100644 --- a/libafl_qemu/libafl_qemu_sys/build_linux.rs +++ b/libafl_qemu/libafl_qemu_sys/build_linux.rs @@ -15,10 +15,6 @@ macro_rules! assert_unique_feature { } pub fn build() { - println!(r#"cargo::rustc-check-cfg=cfg(emulation_mode, values("usermode", "systemmode"))"#); - println!( - r#"cargo::rustc-check-cfg=cfg(cpu_target, values("arm", "aarch64", "hexagon", "i386", "mips", "ppc", "x86_64"))"# - ); // Make sure that exactly one qemu mode is set assert_unique_feature!("usermode", "systemmode"); let emulation_mode = if cfg!(feature = "usermode") {