Skip to content

Commit 848e723

Browse files
committed
[Rust] Misc formatting
1 parent a45c2e4 commit 848e723

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

plugins/dwarf/dwarf_import/src/dwarfdebuginfo.rs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,16 +409,23 @@ impl DebugInfoBuilder {
409409

410410
let Some(adjustment_at_variable_lifetime_start) = lexical_block
411411
.and_then(|block_ranges| {
412-
block_ranges
413-
.unsorted_iter()
414-
.find_map(|x| self.range_data_offsets.values_overlap(x.start).next().cloned())
412+
block_ranges.unsorted_iter().find_map(|x| {
413+
self.range_data_offsets
414+
.values_overlap(x.start)
415+
.next()
416+
.cloned()
417+
})
415418
})
416419
.or_else(|| {
417420
// Try using the offset at the adjustment 5 bytes after the function start, in case the function starts with a stack adjustment
418421
// Calculate final offset as (offset after initial stack adjustment) - (entry offset)
419422
// TODO: This is a decent heuristic but not perfect, since further adjustments could still be made
420-
if let Some(offset_after_stack_adjust) = self.range_data_offsets.values_overlap(func_addr + 5).next() {
421-
if let Some(entry_offset) = self.range_data_offsets.values_overlap(func_addr).next() {
423+
if let Some(offset_after_stack_adjust) =
424+
self.range_data_offsets.values_overlap(func_addr + 5).next()
425+
{
426+
if let Some(entry_offset) =
427+
self.range_data_offsets.values_overlap(func_addr).next()
428+
{
422429
return Some(offset_after_stack_adjust - entry_offset);
423430
}
424431
}
@@ -427,7 +434,10 @@ impl DebugInfoBuilder {
427434
})
428435
.or_else(|| {
429436
// If all else fails, use the function start address
430-
self.range_data_offsets.values_overlap(func_addr).next().cloned()
437+
self.range_data_offsets
438+
.values_overlap(func_addr)
439+
.next()
440+
.cloned()
431441
})
432442
else {
433443
// Unknown why, but this is happening with MachO + external dSYM

0 commit comments

Comments
 (0)