Skip to content

Commit 8f1dc98

Browse files
committed
Apply some clippy suggestions
1 parent 919c877 commit 8f1dc98

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

src/unwinder/find_fde/phdr.rs

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,28 +128,24 @@ fn search_phdr(phdrs: &[Elf_Phdr], base: usize, pc: usize) -> Option<FDESearchRe
128128
}
129129

130130
// Parse .eh_frame_hdr section.
131-
let eh_frame_hdr = EhFrameHdr::new(
132-
get_unlimited_slice(eh_frame_hdr as usize as _),
133-
NativeEndian,
134-
)
135-
.parse(&bases, mem::size_of::<usize>() as _)
136-
.ok()?;
131+
let eh_frame_hdr = EhFrameHdr::new(get_unlimited_slice(eh_frame_hdr as _), NativeEndian)
132+
.parse(&bases, mem::size_of::<usize>() as _)
133+
.ok()?;
137134

138135
let eh_frame = deref_pointer(eh_frame_hdr.eh_frame_ptr());
139136
bases = bases.set_eh_frame(eh_frame as _);
140137
let eh_frame = EhFrame::new(get_unlimited_slice(eh_frame as usize as _), NativeEndian);
141138

142139
// Use binary search table for address if available.
143-
if let Some(table) = eh_frame_hdr.table() {
144-
if let Ok(fde) =
140+
if let Some(table) = eh_frame_hdr.table()
141+
&& let Ok(fde) =
145142
table.fde_for_address(&eh_frame, &bases, pc as _, EhFrame::cie_from_offset)
146-
{
147-
return Some(FDESearchResult {
148-
fde,
149-
bases,
150-
eh_frame,
151-
});
152-
}
143+
{
144+
return Some(FDESearchResult {
145+
fde,
146+
bases,
147+
eh_frame,
148+
});
153149
}
154150

155151
// Otherwise do the linear search.

0 commit comments

Comments
 (0)