@@ -103,6 +103,7 @@ struct SegmentHeader {
103103
104104/// Image format for ESP32 family chips using the second-stage bootloader from
105105/// ESP-IDF
106+ #[ derive( Debug ) ]
106107pub struct IdfBootloaderFormat < ' a > {
107108 params : Esp32Params ,
108109 bootloader : Cow < ' a , [ u8 ] > ,
@@ -368,7 +369,7 @@ impl<'a> IdfBootloaderFormat<'a> {
368369///
369370/// (this is because the segment's vaddr may not be IROM_ALIGNed, more likely is
370371/// aligned IROM_ALIGN+0x18 to account for the binary file header)
371- fn get_segment_padding ( offset : usize , segment : & CodeSegment ) -> u32 {
372+ fn get_segment_padding ( offset : usize , segment : & CodeSegment < ' _ > ) -> u32 {
372373 let align_past = ( segment. addr - SEG_HEADER_LEN ) % IROM_ALIGN ;
373374 let pad_len = ( ( IROM_ALIGN - ( ( offset as u32 ) % IROM_ALIGN ) ) + align_past) % IROM_ALIGN ;
374375
@@ -382,10 +383,10 @@ fn get_segment_padding(offset: usize, segment: &CodeSegment) -> u32 {
382383}
383384
384385/// Merge adjacent segments into one.
385- fn merge_adjacent_segments ( mut segments : Vec < CodeSegment > ) -> Vec < CodeSegment > {
386+ fn merge_adjacent_segments ( mut segments : Vec < CodeSegment < ' _ > > ) -> Vec < CodeSegment < ' _ > > {
386387 segments. sort ( ) ;
387388
388- let mut merged: Vec < CodeSegment > = Vec :: with_capacity ( segments. len ( ) ) ;
389+ let mut merged: Vec < CodeSegment < ' _ > > = Vec :: with_capacity ( segments. len ( ) ) ;
389390 for segment in segments {
390391 match merged. last_mut ( ) {
391392 Some ( last) if last. addr + last. size ( ) == segment. addr => {
@@ -403,7 +404,7 @@ fn merge_adjacent_segments(mut segments: Vec<CodeSegment>) -> Vec<CodeSegment> {
403404/// Save a segment to the data buffer.
404405fn save_flash_segment (
405406 data : & mut Vec < u8 > ,
406- mut segment : CodeSegment ,
407+ mut segment : CodeSegment < ' _ > ,
407408 checksum : u8 ,
408409) -> Result < u8 , Error > {
409410 let end_pos = ( data. len ( ) + segment. data ( ) . len ( ) ) as u32 + SEG_HEADER_LEN ;
@@ -424,7 +425,7 @@ fn save_flash_segment(
424425}
425426
426427/// Stores a segment header and the segment data in the data buffer.
427- fn save_segment ( data : & mut Vec < u8 > , segment : & CodeSegment , checksum : u8 ) -> Result < u8 , Error > {
428+ fn save_segment ( data : & mut Vec < u8 > , segment : & CodeSegment < ' _ > , checksum : u8 ) -> Result < u8 , Error > {
428429 let padding = ( 4 - segment. size ( ) % 4 ) % 4 ;
429430 let header = SegmentHeader {
430431 addr : segment. addr ,
0 commit comments