From 3c4b5a7fa1cfaa20be7483bf932ddc017320b375 Mon Sep 17 00:00:00 2001
From: Thomas Rooijakkers <thomas.rooijakkers@tno.nl>
Date: Tue, 23 Sep 2025 13:15:11 +0200
Subject: [PATCH 1/3] Revert faulty renaming

---
 crates/libafl/src/corpus/minimizer.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/libafl/src/corpus/minimizer.rs b/crates/libafl/src/corpus/minimizer.rs
index 9b5b82809b2..135fe268847 100644
--- a/crates/libafl/src/corpus/minimizer.rs
+++ b/crates/libafl/src/corpus/minimizer.rs
@@ -20,7 +20,7 @@ use crate::{
     inputs::Input,
     monitors::stats::{AggregatorOps, UserStats, UserStatsValue},
     observers::{MapObserver, ObserversTuple},
-    schedulers::{LenTimeMulTestcasePenalty, RemovableScheduler, Scheduler, TestcasePenalty},
+    schedulers::{LenTimeMulTestcasePenalty, RemovableScheduler, Scheduler, TestcasePenalty, TestcaseScore},
     stages::run_target_with_timing,
     state::{HasCorpus, HasExecutions},
 };
@@ -59,7 +59,7 @@ where
     I: Input,
     S: HasMetadata + HasCorpus<I> + HasExecutions,
     T: Copy + Hash + Eq,
-    TS: TestcasePenalty<I, S>,
+    TS: TestcaseScore<I, S>,
 {
     /// Do the minimization
     #[expect(clippy::too_many_lines)]

From 1dd81eec30d2f3ef59a14cd290a75bf150bc0dc3 Mon Sep 17 00:00:00 2001
From: Thomas Rooijakkers <thomas.rooijakkers@tno.nl>
Date: Tue, 23 Sep 2025 14:17:10 +0200
Subject: [PATCH 2/3] Revert "Revert faulty renaming"

This reverts commit 3c4b5a7fa1cfaa20be7483bf932ddc017320b375.
---
 crates/libafl/src/corpus/minimizer.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/libafl/src/corpus/minimizer.rs b/crates/libafl/src/corpus/minimizer.rs
index 135fe268847..9b5b82809b2 100644
--- a/crates/libafl/src/corpus/minimizer.rs
+++ b/crates/libafl/src/corpus/minimizer.rs
@@ -20,7 +20,7 @@ use crate::{
     inputs::Input,
     monitors::stats::{AggregatorOps, UserStats, UserStatsValue},
     observers::{MapObserver, ObserversTuple},
-    schedulers::{LenTimeMulTestcasePenalty, RemovableScheduler, Scheduler, TestcasePenalty, TestcaseScore},
+    schedulers::{LenTimeMulTestcasePenalty, RemovableScheduler, Scheduler, TestcasePenalty},
     stages::run_target_with_timing,
     state::{HasCorpus, HasExecutions},
 };
@@ -59,7 +59,7 @@ where
     I: Input,
     S: HasMetadata + HasCorpus<I> + HasExecutions,
     T: Copy + Hash + Eq,
-    TS: TestcaseScore<I, S>,
+    TS: TestcasePenalty<I, S>,
 {
     /// Do the minimization
     #[expect(clippy::too_many_lines)]

From d9b3af4da804347b93313005926be84a6bb8d11f Mon Sep 17 00:00:00 2001
From: Thomas Rooijakkers <thomas.rooijakkers@tno.nl>
Date: Tue, 23 Sep 2025 14:19:18 +0200
Subject: [PATCH 3/3] Should use TP instead of TS for Penalty

---
 crates/libafl/src/corpus/minimizer.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/libafl/src/corpus/minimizer.rs b/crates/libafl/src/corpus/minimizer.rs
index 9b5b82809b2..5d132c2b5ab 100644
--- a/crates/libafl/src/corpus/minimizer.rs
+++ b/crates/libafl/src/corpus/minimizer.rs
@@ -29,16 +29,16 @@ use crate::{
 ///
 /// Algorithm based on WMOPT: <https://hexhive.epfl.ch/publications/files/21ISSTA2.pdf>
 #[derive(Debug)]
-pub struct MapCorpusMinimizer<C, E, I, O, S, T, TS> {
+pub struct MapCorpusMinimizer<C, E, I, O, S, T, TP> {
     observer_handle: Handle<C>,
-    phantom: PhantomData<(E, I, O, S, T, TS)>,
+    phantom: PhantomData<(E, I, O, S, T, TP)>,
 }
 
 /// Standard corpus minimizer, which weights inputs by length and time.
 pub type StdCorpusMinimizer<C, E, I, O, S, T> =
     MapCorpusMinimizer<C, E, I, O, S, T, LenTimeMulTestcasePenalty>;
 
-impl<C, E, I, O, S, T, TS> MapCorpusMinimizer<C, E, I, O, S, T, TS>
+impl<C, E, I, O, S, T, TP> MapCorpusMinimizer<C, E, I, O, S, T, TP>
 where
     C: Named,
 {
@@ -52,14 +52,14 @@ where
     }
 }
 
-impl<C, E, I, O, S, T, TS> MapCorpusMinimizer<C, E, I, O, S, T, TS>
+impl<C, E, I, O, S, T, TP> MapCorpusMinimizer<C, E, I, O, S, T, TP>
 where
     for<'a> O: MapObserver<Entry = T> + AsIter<'a, Item = T>,
     C: AsRef<O>,
     I: Input,
     S: HasMetadata + HasCorpus<I> + HasExecutions,
     T: Copy + Hash + Eq,
-    TS: TestcasePenalty<I, S>,
+    TP: TestcasePenalty<I, S>,
 {
     /// Do the minimization
     #[expect(clippy::too_many_lines)]
@@ -121,7 +121,7 @@ where
 
                 let mut testcase = state.corpus().get(id)?.borrow_mut();
                 (
-                    TS::compute(state, &mut *testcase)?
+                    TP::compute(state, &mut *testcase)?
                         .to_u64()
                         .expect("Weight must be computable."),
                     *state.executions(),