From 20ad182d9ecf50e5c20c7e3f3743dea73fe455a0 Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Sat, 12 Dec 2020 15:25:34 +0100
Subject: [PATCH] almost compiles

---
 afl/src/events/mod.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/afl/src/events/mod.rs b/afl/src/events/mod.rs
index 7dd73cf0b3..cf12a52afb 100644
--- a/afl/src/events/mod.rs
+++ b/afl/src/events/mod.rs
@@ -221,7 +221,7 @@ where
     }
 
     /// Broker fun
-    fn handle_in_broker(&mut self, event: &Event<I>) -> Result<BrokerEventResult, AflError> {
+    fn handle_in_broker(&mut self, event: &Event<I, OT>) -> Result<BrokerEventResult, AflError> {
         match event {
             Event::NewTestcase {
                 sender_id: _,
@@ -293,8 +293,8 @@ where
     /// Client fun
     fn handle_in_client(
         &mut self,
-        event: Event<I>,
-        state: &mut State<I, R>,
+        event: Event<I, OT>,
+        state: &mut State<I, R, FT>,
         corpus: &mut C,
     ) -> Result<(), AflError> {
         match event {
@@ -340,7 +340,7 @@ where
     corpus_size: usize,
     start_time: time::Duration,
     client_stats: Vec<ClientStats>,
-    phantom: PhantomData<(C, E, I, R)>,
+    phantom: PhantomData<(C, E, I, R, OT, FT)>,
 }
 
 #[cfg(feature = "std")]
@@ -454,18 +454,19 @@ where
 }
 
 #[cfg(feature = "std")]
-impl<C, E, I, R, W> EventManager<C, E, I, R> for LlmpEventManager<C, E, I, R, W>
+impl<C, E, OT, FT, I, R, W> EventManager<C, E, OT, FT, I, R> for LlmpEventManager<C, E, I, R, W>
 where
     C: Corpus<I, R>,
     E: Executor<I>,
     FT: FeedbacksTuple<I>,
+    OT: ObserversTuple,
     I: Input,
     R: Rand,
     W: Write,
     //CE: CustomEvent<I>,
 {
     #[inline]
-    fn fire<'a>(&mut self, event: Event<'a, I>) -> Result<(), AflError> {
+    fn fire<'a>(&mut self, event: Event<'a, I, OT>) -> Result<(), AflError> {
         let serialized = postcard::to_allocvec(&event)?;
         self.send_buf(LLMP_TAG_EVENT_TO_CLIENT, &serialized)?;
         Ok(())