From 2265d672fcea845bbc05e5bbca7c2bab80086b77 Mon Sep 17 00:00:00 2001
From: clesmian <18008727+clesmian@users.noreply.github.com>
Date: Thu, 13 Jun 2024 23:35:20 +0200
Subject: [PATCH] Allow trailing comma in feedback macros (#2308)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leon Weiß <leon.weiss@rub.de>
---
 libafl/src/feedbacks/mod.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libafl/src/feedbacks/mod.rs b/libafl/src/feedbacks/mod.rs
index 29bff15fbc..3cd3457835 100644
--- a/libafl/src/feedbacks/mod.rs
+++ b/libafl/src/feedbacks/mod.rs
@@ -839,7 +839,9 @@ where
 macro_rules! feedback_and {
     ( $last:expr ) => { $last };
 
-    ( $head:expr, $($tail:expr), +) => {
+    ( $last:expr, ) => { $last };
+
+    ( $head:expr, $($tail:expr),+ $(,)?) => {
         // recursive call
         $crate::feedbacks::EagerAndFeedback::new($head , feedback_and!($($tail),+))
     };
@@ -850,7 +852,9 @@ macro_rules! feedback_and {
 macro_rules! feedback_and_fast {
     ( $last:expr ) => { $last };
 
-    ( $head:expr, $($tail:expr), +) => {
+    ( $last:expr, ) => { $last };
+
+    ( $head:expr, $($tail:expr),+ $(,)?) => {
         // recursive call
         $crate::feedbacks::FastAndFeedback::new($head , feedback_and_fast!($($tail),+))
     };
@@ -861,7 +865,9 @@ macro_rules! feedback_and_fast {
 macro_rules! feedback_or {
     ( $last:expr ) => { $last };
 
-    ( $head:expr, $($tail:expr), +) => {
+    ( $last:expr, ) => { $last };
+
+    ( $head:expr, $($tail:expr),+ $(,)?) => {
         // recursive call
         $crate::feedbacks::EagerOrFeedback::new($head , feedback_or!($($tail),+))
     };
@@ -872,7 +878,9 @@ macro_rules! feedback_or {
 macro_rules! feedback_or_fast {
     ( $last:expr ) => { $last };
 
-    ( $head:expr, $($tail:expr), +) => {
+    ( $last:expr, ) => { $last };
+
+    ( $head:expr, $($tail:expr),+ $(,)?) => {
         // recursive call
         $crate::feedbacks::FastOrFeedback::new($head , feedback_or_fast!($($tail),+))
     };