Skip to content

Commit adca7f1

Browse files
committed
Style improvements
1 parent d881495 commit adca7f1

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/symbolize/gimli/libs_dl_iterate_phdr.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ use super::{Library, LibrarySegment, OsString, Vec};
1010
use core::slice;
1111

1212
struct CallbackData {
13-
ret: Vec<Library>,
13+
libs: Vec<Library>,
1414
#[cfg(target_os = "android")]
1515
maps: Option<Vec<super::parse_running_mmaps::MapsEntry>>,
1616
}
1717
pub(super) fn native_libraries() -> Vec<Library> {
1818
let mut cb_data = CallbackData {
19-
ret: Vec::new(),
19+
libs: Vec::new(),
2020
#[cfg(target_os = "android")]
2121
maps: super::parse_running_mmaps::parse_maps().ok(),
2222
};
2323
unsafe {
2424
libc::dl_iterate_phdr(Some(callback), core::ptr::addr_of_mut!(cb_data).cast());
2525
}
26-
cb_data.ret
26+
cb_data.libs
2727
}
2828

2929
fn infer_current_exe(base_addr: usize) -> OsString {
@@ -60,7 +60,7 @@ unsafe extern "C" fn callback(
6060
let dlpi_phnum = unsafe { (*info).dlpi_phnum };
6161
// SAFETY: We assured this.
6262
let CallbackData {
63-
ret: libs,
63+
libs,
6464
#[cfg(target_os = "android")]
6565
maps,
6666
} = unsafe { &mut *data.cast::<CallbackData>() };

src/symbolize/gimli/mmap_fake.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use super::{mystd::io::Read, mystd::io::Seek, mystd::io::SeekFrom, File};
1+
use super::File;
2+
use super::{mystd::io::Read, mystd::io::Seek, mystd::io::SeekFrom};
23
use alloc::vec::Vec;
34
use core::ops::Deref;
45

0 commit comments

Comments
 (0)