From fa1e3fd50434d1957993a4efb9e2b1e55050d3fe Mon Sep 17 00:00:00 2001 From: "Dongjia \"toka\" Zhang" Date: Mon, 5 Jun 2023 16:29:51 +0200 Subject: [PATCH] CI (#1301) * ci * fi * Revert "fi" This reverts commit ed298d71057607f019e64d58687273a01d30e260. * Revert "ci" This reverts commit 6b65936990143a6069abd56dcbe633ac37be2ede. * fi --- libafl/Cargo.toml | 6 +++--- libafl/src/executors/forkserver.rs | 2 +- libafl/src/executors/timeout.rs | 4 ++-- libafl/src/lib.rs | 4 +++- libafl/src/monitors/mod.rs | 4 ++-- libafl/src/monitors/prometheus.rs | 2 +- libafl_frida/src/lib.rs | 3 ++- libafl_qemu/src/asan.rs | 2 +- libafl_qemu/src/lib.rs | 1 + libafl_qemu/src/snapshot.rs | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/libafl/Cargo.toml b/libafl/Cargo.toml index d902d06e89..683d659a87 100644 --- a/libafl/Cargo.toml +++ b/libafl/Cargo.toml @@ -92,9 +92,9 @@ clap = {version = "4.0", features = ["derive", "wrap_help"], optional = true} prometheus-client = { version= "0.19", optional = true} tide = { version = "0.16.0", optional = true } -async-std = { version = "1.8.0", features = ["attributes"], optional = true } +async-std = { version = "1.12.0", features = ["attributes"], optional = true } futures = { version = "0.3.24", optional = true } -log = "0.4.17" +log = "0.4.18" wait-timeout = { version = "0.2", optional = true } # used by CommandExecutor to wait for child process @@ -106,7 +106,7 @@ concat-idents = { version = "1.1.3", optional = true } libcasr = { version = "2.5", optional = true} # optional-dev deps (change when target.'cfg(accessible(::std))'.test-dependencies will be stable) -serial_test = { version = "1", optional = true } +serial_test = { version = "2", optional = true } # AGPL # !!! this create requires nightly diff --git a/libafl/src/executors/forkserver.rs b/libafl/src/executors/forkserver.rs index 445aaeb4f4..0d3f07dc38 100644 --- a/libafl/src/executors/forkserver.rs +++ b/libafl/src/executors/forkserver.rs @@ -551,7 +551,7 @@ where .field("forkserver", &self.forkserver) .field("observers", &self.observers) .field("map", &self.map) - .finish() + .finish_non_exhaustive() } } diff --git a/libafl/src/executors/timeout.rs b/libafl/src/executors/timeout.rs index 5c9e2322bf..53ccee00a7 100644 --- a/libafl/src/executors/timeout.rs +++ b/libafl/src/executors/timeout.rs @@ -133,7 +133,7 @@ impl Debug for TimeoutExecutor { &(&self.itimerspec.it_value.tv_sec * 1000 + &self.itimerspec.it_value.tv_nsec / 1000 / 1000), ) - .finish() + .finish_non_exhaustive() } #[cfg(all(unix, not(target_os = "linux")))] @@ -141,7 +141,7 @@ impl Debug for TimeoutExecutor { f.debug_struct("TimeoutExecutor") .field("executor", &self.executor) .field("itimerval", &self.itimerval) - .finish() + .finish_non_exhaustive() } } diff --git a/libafl/src/lib.rs b/libafl/src/lib.rs index 835a92932e..c3aaea58cf 100644 --- a/libafl/src/lib.rs +++ b/libafl/src/lib.rs @@ -11,6 +11,7 @@ Welcome to `LibAFL` // For `std::simd` #![cfg_attr(unstable_feature, feature(portable_simd))] #![warn(clippy::cargo)] +#![allow(ambiguous_glob_reexports)] #![deny(clippy::cargo_common_metadata)] #![deny(rustdoc::broken_intra_doc_links)] #![deny(clippy::all)] @@ -24,7 +25,8 @@ Welcome to `LibAFL` clippy::ptr_as_ptr, clippy::missing_panics_doc, clippy::missing_docs_in_private_items, - clippy::module_name_repetitions + clippy::module_name_repetitions, + clippy::ptr_cast_constness )] #![cfg_attr(not(test), warn( missing_debug_implementations, diff --git a/libafl/src/monitors/mod.rs b/libafl/src/monitors/mod.rs index c4b8f9febc..8730876537 100644 --- a/libafl/src/monitors/mod.rs +++ b/libafl/src/monitors/mod.rs @@ -418,7 +418,7 @@ where f.debug_struct("SimpleMonitor") .field("start_time", &self.start_time) .field("client_stats", &self.client_stats) - .finish() + .finish_non_exhaustive() } } @@ -995,7 +995,7 @@ pub mod pybind { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("PythonSimpleMonitor") .field("print_fn", &self.print_fn) - .finish() + .finish_non_exhaustive() } } diff --git a/libafl/src/monitors/prometheus.rs b/libafl/src/monitors/prometheus.rs index 5007dbe6ea..f7b55b75ae 100644 --- a/libafl/src/monitors/prometheus.rs +++ b/libafl/src/monitors/prometheus.rs @@ -71,7 +71,7 @@ where f.debug_struct("PrometheusMonitor") .field("start_time", &self.start_time) .field("client_stats", &self.client_stats) - .finish() + .finish_non_exhaustive() } } diff --git a/libafl_frida/src/lib.rs b/libafl_frida/src/lib.rs index fb5939e4de..46b277a5c6 100644 --- a/libafl_frida/src/lib.rs +++ b/libafl_frida/src/lib.rs @@ -18,7 +18,8 @@ Additional documentation is available in [the `LibAFL` book](https://aflplus.plu clippy::missing_panics_doc, clippy::missing_docs_in_private_items, clippy::module_name_repetitions, - clippy::unreadable_literal + clippy::unreadable_literal, + clippy::ptr_cast_constness )] #![cfg_attr(not(test), warn( missing_debug_implementations, diff --git a/libafl_qemu/src/asan.rs b/libafl_qemu/src/asan.rs index 427a17a2b1..65456196e5 100644 --- a/libafl_qemu/src/asan.rs +++ b/libafl_qemu/src/asan.rs @@ -111,7 +111,7 @@ impl core::fmt::Debug for AsanGiovese { f.debug_struct("AsanGiovese") .field("alloc_tree", &self.alloc_tree) .field("dirty_shadow", &self.dirty_shadow) - .finish() + .finish_non_exhaustive() } } diff --git a/libafl_qemu/src/lib.rs b/libafl_qemu/src/lib.rs index f3c9f64fd0..df89d5b6c6 100644 --- a/libafl_qemu/src/lib.rs +++ b/libafl_qemu/src/lib.rs @@ -8,6 +8,7 @@ )] #![allow(clippy::needless_pass_by_value)] #![allow(clippy::transmute_ptr_to_ptr)] +#![allow(clippy::ptr_cast_constness)] #![allow(clippy::too_many_arguments)] // Till they fix this buggy lint in clippy #![allow(clippy::borrow_as_ptr)] diff --git a/libafl_qemu/src/snapshot.rs b/libafl_qemu/src/snapshot.rs index aa2bba36a4..ef4d516f05 100644 --- a/libafl_qemu/src/snapshot.rs +++ b/libafl_qemu/src/snapshot.rs @@ -88,7 +88,7 @@ impl core::fmt::Debug for QemuSnapshotHelper { .field("mmap_start", &self.mmap_start) .field("mmap_limit", &self.mmap_limit) .field("empty", &self.empty) - .finish() + .finish_non_exhaustive() } }