From 00bff4d06dc7daf1ff905a35364e4180ae07c008 Mon Sep 17 00:00:00 2001
From: Andrew <andrew@digerati.co.nz>
Date: Fri, 24 Jan 2025 17:34:28 +1300
Subject: [PATCH] Show zopfli iterations

---
 src/deflate/mod.rs | 4 ++--
 src/lib.rs         | 6 +++---
 tests/flags.rs     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/deflate/mod.rs b/src/deflate/mod.rs
index a9bd4afe..e3be0c4f 100644
--- a/src/deflate/mod.rs
+++ b/src/deflate/mod.rs
@@ -49,9 +49,9 @@ impl Display for Deflaters {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Libdeflater { compression } => Display::fmt(compression, f),
+            Self::Libdeflater { compression } => Display::fmt(&format!("zc = {}", compression), f),
             #[cfg(feature = "zopfli")]
-            Self::Zopfli { .. } => Display::fmt("zopfli", f),
+            Self::Zopfli { iterations } => Display::fmt(&format!("zopfli, zi = {}", iterations), f),
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index bc9d4788..0832f08d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -474,7 +474,7 @@ fn optimize_raw(
 
     if max_size.map_or(true, |max_size| result.estimated_output_size() < max_size) {
         debug!("Found better result:");
-        debug!("    zc = {}  f = {}", deflater, result.filter);
+        debug!("    {}, f = {}", deflater, result.filter);
         return Some(result);
     }
     None
@@ -525,7 +525,7 @@ fn perform_trials(
         let mut result = eval_result?;
 
         // Recompress with the main deflater
-        debug!("Trying filter {}, zc = {}", result.filter, opts.deflate);
+        debug!("Trying filter {} with {}", result.filter, opts.deflate);
         match opts.deflate.deflate(&result.filtered, max_size) {
             Ok(idat_data) => {
                 result.idat_data = idat_data;
@@ -552,7 +552,7 @@ fn perform_trials(
         }
     }
 
-    debug!("Trying {} filters, zc = {}", filters.len(), opts.deflate);
+    debug!("Trying {} filters with {}", filters.len(), opts.deflate);
     let eval = Evaluator::new(deadline, filters, opts.deflate, opts.optimize_alpha);
     if let Some(max_size) = max_size {
         eval.set_best_size(max_size);
diff --git a/tests/flags.rs b/tests/flags.rs
index 4c8ced95..4d4feb63 100644
--- a/tests/flags.rs
+++ b/tests/flags.rs
@@ -181,9 +181,9 @@ fn verbose_mode() {
         "    8-bit RGB, non-interlaced",
         "    IDAT size = 113794 bytes",
         "    File size = 114708 bytes",
-        "Trying 1 filters, zc = ",
+        "Trying 1 filters with zc = ",
         "Found better result:",
-        "    zc = 11  f = None",
+        "    zc = 11, f = None",
         "    IDAT size = ",
         "    file size = ",
     ];