From c3d3c93bc09788b4994c87ec8a1e0f8d7b3ca3a2 Mon Sep 17 00:00:00 2001 From: Dongjia Zhang Date: Mon, 21 Mar 2022 15:54:46 +0900 Subject: [PATCH] CI Fix (#572) * clippy * doc * refactor --- libafl/src/events/llmp.rs | 9 +++------ libafl/src/observers/owned.rs | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libafl/src/events/llmp.rs b/libafl/src/events/llmp.rs index 61c75a98e8..500afef51b 100644 --- a/libafl/src/events/llmp.rs +++ b/libafl/src/events/llmp.rs @@ -456,8 +456,8 @@ where { fn process(&mut self, fuzzer: &mut Z, state: &mut S, executor: &mut E) -> Result { // TODO: Get around local event copy by moving handle_in_client - let mut events = vec![]; let self_id = self.llmp.sender.id; + let mut count = 0; while let Some((client_id, tag, _flags, msg)) = self.llmp.recv_buf_with_flags()? { assert!( tag != _LLMP_TAG_EVENT_TO_BROKER, @@ -479,12 +479,9 @@ where msg }; let event: Event = postcard::from_bytes(event_bytes)?; - events.push((client_id, event)); + self.handle_in_client(fuzzer, executor, state, client_id, event)?; + count += 1; } - let count = events.len(); - events.drain(..).try_for_each(|(client_id, event)| { - self.handle_in_client(fuzzer, executor, state, client_id, event) - })?; Ok(count) } } diff --git a/libafl/src/observers/owned.rs b/libafl/src/observers/owned.rs index 7e319c9ec9..ab05d9d69e 100644 --- a/libafl/src/observers/owned.rs +++ b/libafl/src/observers/owned.rs @@ -41,7 +41,7 @@ crate::create_anymap_for_trait!( pub use observers_anymap::{AnyMap as ObserversAnyMap, NamedAnyMap as NamedObserversAnyMap}; /// An owned list of `Observer` trait objects -/// This is not really serializable, using this struct needs [`EventConfig::AlwaysUnique`] as configuration +/// This is not really serializable, using this struct needs [`crate::events::EventConfig::AlwaysUnique`] as configuration #[derive(Debug, Default)] pub struct ObserversOwnedMap { /// The named trait objects map