From c7fc4b92f263123a5afcf29dcda57475bfa47668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel=20Buga?= <bugadani@gmail.com>
Date: Wed, 11 Jan 2023 23:25:32 +0100
Subject: [PATCH] Pass in progress callbacks by value

---
 cargo-espflash/src/main.rs   |  2 +-
 espflash/src/bin/espflash.rs |  4 ++--
 espflash/src/cli/mod.rs      |  2 +-
 espflash/src/flasher/mod.rs  | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
index 99cc881d..3be40061 100644
--- a/cargo-espflash/src/main.rs
+++ b/cargo-espflash/src/main.rs
@@ -171,7 +171,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     print_board_info(&mut flasher)?;
 
     if args.flash_args.ram {
-        flasher.load_elf_to_ram(&elf_data, Some(&mut EspflashProgress::default()))?;
+        flasher.load_elf_to_ram(&elf_data, EspflashProgress::default())?;
     } else {
         let bootloader = args
             .flash_args
diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
index bb796288..e5928376 100644
--- a/espflash/src/bin/espflash.rs
+++ b/espflash/src/bin/espflash.rs
@@ -126,7 +126,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
     let elf_data = fs::read(&args.image).into_diagnostic()?;
 
     if args.flash_args.ram {
-        flasher.load_elf_to_ram(&elf_data, &mut EspflashProgress::default())?;
+        flasher.load_elf_to_ram(&elf_data, EspflashProgress::default())?;
     } else {
         let bootloader = args.flash_args.bootloader.as_deref();
         let partition_table = args.flash_args.partition_table.as_deref();
@@ -233,7 +233,7 @@ fn write_bin(args: WriteBinArgs, config: &Config) -> Result<()> {
     let mut buffer = Vec::with_capacity(size.try_into().into_diagnostic()?);
     f.read_to_end(&mut buffer).into_diagnostic()?;
 
-    flasher.write_bin_to_flash(args.addr, &buffer, &mut EspflashProgress::default())?;
+    flasher.write_bin_to_flash(args.addr, &buffer, EspflashProgress::default())?;
 
     Ok(())
 }
diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs
index 528dcd61..dfa090bf 100644
--- a/espflash/src/cli/mod.rs
+++ b/espflash/src/cli/mod.rs
@@ -468,7 +468,7 @@ pub fn flash_elf_image(
         flash_mode,
         flash_size,
         flash_freq,
-        &mut EspflashProgress::default(),
+        EspflashProgress::default(),
     )?;
     info!("Flashing has completed!");
 
diff --git a/espflash/src/flasher/mod.rs b/espflash/src/flasher/mod.rs
index 62e50498..3a547b0f 100644
--- a/espflash/src/flasher/mod.rs
+++ b/espflash/src/flasher/mod.rs
@@ -629,7 +629,7 @@ impl Flasher {
     pub fn load_elf_to_ram(
         &mut self,
         elf_data: &[u8],
-        progress: &mut dyn ProgressCallbacks,
+        mut progress: impl ProgressCallbacks,
     ) -> Result<(), Error> {
         let image = ElfFirmwareImage::try_from(elf_data)?;
         if image.rom_segments(self.chip).next().is_some() {
@@ -646,7 +646,7 @@ impl Flasher {
 
         for segment in image.ram_segments(self.chip) {
             target
-                .write_segment(&mut self.connection, segment.into(), progress)
+                .write_segment(&mut self.connection, segment.into(), &mut progress)
                 .flashing()?;
         }
 
@@ -663,7 +663,7 @@ impl Flasher {
         flash_mode: Option<FlashMode>,
         flash_size: Option<FlashSize>,
         flash_freq: Option<FlashFrequency>,
-        progress: &mut dyn ProgressCallbacks,
+        mut progress: impl ProgressCallbacks,
     ) -> Result<(), Error> {
         let image = ElfFirmwareImage::try_from(elf_data)?;
 
@@ -691,7 +691,7 @@ impl Flasher {
 
         for segment in image.flash_segments() {
             target
-                .write_segment(&mut self.connection, segment, progress)
+                .write_segment(&mut self.connection, segment, &mut progress)
                 .flashing()?;
         }
 
@@ -705,7 +705,7 @@ impl Flasher {
         &mut self,
         addr: u32,
         data: &[u8],
-        progress: &mut dyn ProgressCallbacks,
+        mut progress: impl ProgressCallbacks,
     ) -> Result<(), Error> {
         let segment = RomSegment {
             addr,
@@ -714,7 +714,7 @@ impl Flasher {
 
         let mut target = self.chip.flash_target(self.spi_params, self.use_stub);
         target.begin(&mut self.connection).flashing()?;
-        target.write_segment(&mut self.connection, segment, progress)?;
+        target.write_segment(&mut self.connection, segment, &mut progress)?;
         target.finish(&mut self.connection, true).flashing()?;
 
         Ok(())
@@ -729,7 +729,7 @@ impl Flasher {
         flash_mode: Option<FlashMode>,
         flash_size: Option<FlashSize>,
         flash_freq: Option<FlashFrequency>,
-        progress: &mut dyn ProgressCallbacks,
+        progress: impl ProgressCallbacks,
     ) -> Result<(), Error> {
         self.load_elf_to_flash_with_format(
             elf_data,