From 8fa654dd61002bd45f5df12fc7347d84d3033882 Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Wed, 9 Jun 2021 14:34:38 +0200
Subject: [PATCH] fix generics for ShadowExecutor

---
 libafl/src/executors/combined.rs | 7 ++++++-
 libafl/src/executors/shadow.rs   | 2 +-
 libafl/src/stages/mod.rs         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libafl/src/executors/combined.rs b/libafl/src/executors/combined.rs
index a4ae7b3ccb..9d1b3225e8 100644
--- a/libafl/src/executors/combined.rs
+++ b/libafl/src/executors/combined.rs
@@ -15,7 +15,12 @@ pub struct CombinedExecutor<A, B> {
 
 impl<A, B> CombinedExecutor<A, B> {
     /// Create a new `CombinedExecutor`, wrapping the given `executor`s.
-    pub fn new<EM, I, S, Z>(primary: A, secondary: B) -> Self {
+    pub fn new<EM, I, S, Z>(primary: A, secondary: B) -> Self
+    where
+        A: Executor<EM, I, S, Z>,
+        B: Executor<EM, I, S, Z>,
+        I: Input,
+    {
         Self { primary, secondary }
     }
 
diff --git a/libafl/src/executors/shadow.rs b/libafl/src/executors/shadow.rs
index a3cec08f43..2f15dc1888 100644
--- a/libafl/src/executors/shadow.rs
+++ b/libafl/src/executors/shadow.rs
@@ -40,7 +40,7 @@ where
     SOT: ObserversTuple,
 {
     /// Create a new `ShadowExecutor`, wrapping the given `executor`.
-    pub fn new<EM, I, S, Z>(executor: E, shadow_observers: SOT) -> Self {
+    pub fn new(executor: E, shadow_observers: SOT) -> Self {
         Self {
             executor,
             shadow_observers,
diff --git a/libafl/src/stages/mod.rs b/libafl/src/stages/mod.rs
index a9eebc8316..5042d8e680 100644
--- a/libafl/src/stages/mod.rs
+++ b/libafl/src/stages/mod.rs
@@ -9,7 +9,7 @@ pub mod mutational;
 pub use mutational::{MutationalStage, StdMutationalStage};
 
 pub mod tracing;
-pub use tracing::TracingStage;
+pub use tracing::{ShadowTracingStage, TracingStage};
 
 //pub mod power;
 //pub use power::PowerMutationalStage;