Remove a bunch of unnecessary Box<dyn> (#898)

Author: bugadani

espflash/src/connection/mod.rs

@@ -168,7 +168,7 @@ impl Connection {
         );
 
         for (_, reset_strategy) in zip(0..MAX_CONNECT_ATTEMPTS, reset_sequence.iter().cycle()) {
-            match self.connect_attempt(reset_strategy) {
+            match self.connect_attempt(reset_strategy.as_ref()) {
                 Ok(_) => {
                     return Ok(());
                 }
@@ -182,8 +182,7 @@ impl Connection {
     }
 
     /// Try to connect to a device.
-    #[allow(clippy::borrowed_box)]
-    fn connect_attempt(&mut self, reset_strategy: &Box<dyn ResetStrategy>) -> Result<(), Error> {
+    fn connect_attempt(&mut self, reset_strategy: &dyn ResetStrategy) -> Result<(), Error> {
         // If we're doing no_sync, we're likely communicating as a pass through
         // with an intermediate device to the ESP32
         if self.before_operation == ResetBeforeOperation::NoResetNoSync {

espflash/src/image_format/idf.rs

@@ -586,7 +586,7 @@ impl<'a> IdfBootloaderFormat<'a> {
     }
 
     /// Returns an iterator over the [Segment]'s that should be placed in flash.
-    pub fn flash_segments<'b>(self) -> Box<dyn Iterator<Item = Segment<'b>> + 'b>
+    pub fn flash_segments<'b>(self) -> impl Iterator<Item = Segment<'b>>
     where
         'a: 'b,
     {
@@ -605,19 +605,17 @@ impl<'a> IdfBootloaderFormat<'a> {
             data: self.flash_segment.data,
         };
 
-        Box::new(
-            once(bootloader_segment)
-                .chain(once(partition_table_segment))
-                .chain(once(app_segment)),
-        )
+        once(bootloader_segment)
+            .chain(once(partition_table_segment))
+            .chain(once(app_segment))
     }
 
     /// Returns an iterator over the OTA segment.
-    pub fn ota_segments<'b>(self) -> Box<dyn Iterator<Item = Segment<'b>> + 'b>
+    pub fn ota_segments<'b>(self) -> impl Iterator<Item = Segment<'b>>
     where
         'a: 'b,
     {
-        Box::new(once(self.flash_segment))
+        once(self.flash_segment)
     }
 
     /// Returns a map of metadata about the application image.

espflash/src/image_format/mod.rs

@@ -205,35 +205,33 @@ impl Ord for Segment<'_> {
 pub(crate) fn ram_segments<'a>(
     chip: Chip,
     elf: &'a ElfFile<'a>,
-) -> Box<dyn Iterator<Item = Segment<'a>> + 'a> {
-    Box::new(segments(elf).filter(move |segment| !chip.addr_is_flash(segment.addr)))
+) -> impl Iterator<Item = Segment<'a>> {
+    segments(elf).filter(move |segment| !chip.addr_is_flash(segment.addr))
 }
 
 /// Returns an iterator over all ROM segments for a given chip and ELF file.
 pub(crate) fn rom_segments<'a>(
     chip: Chip,
     elf: &'a ElfFile<'a>,
-) -> Box<dyn Iterator<Item = Segment<'a>> + 'a> {
-    Box::new(segments(elf).filter(move |segment| chip.addr_is_flash(segment.addr)))
+) -> impl Iterator<Item = Segment<'a>> {
+    segments(elf).filter(move |segment| chip.addr_is_flash(segment.addr))
 }
 
-fn segments<'a>(elf: &'a ElfFile<'a>) -> Box<dyn Iterator<Item = Segment<'a>> + 'a> {
-    Box::new(
-        elf.sections()
-            .filter(|section| {
-                let header = section.elf_section_header();
-
-                section.size() > 0
-                    && header.sh_type(Endianness::Little) == SHT_PROGBITS
-                    && header.sh_offset.get(Endianness::Little) > 0
-                    && section.address() > 0
-                    && !is_empty(section.flags())
-            })
-            .flat_map(move |section| match section.data() {
-                Ok(data) => Some(Segment::new(section.address() as u32, data)),
-                _ => None,
-            }),
-    )
+fn segments<'a>(elf: &'a ElfFile<'a>) -> impl Iterator<Item = Segment<'a>> {
+    elf.sections()
+        .filter(|section| {
+            let header = section.elf_section_header();
+
+            section.size() > 0
+                && header.sh_type(Endianness::Little) == SHT_PROGBITS
+                && header.sh_offset.get(Endianness::Little) > 0
+                && section.address() > 0
+                && !is_empty(section.flags())
+        })
+        .flat_map(move |section| match section.data() {
+            Ok(data) => Some(Segment::new(section.address() as u32, data)),
+            _ => None,
+        })
 }
 
 fn is_empty(flags: object::SectionFlags) -> bool {