bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #136479 - RalfJung:dirent64, r=tgross35

Browse source 
std::fs: further simplify dirent64 handling

Follow-up to https://github.com/rust-lang/rust/pull/134678.

r? `@tgross35`
This commit is contained in:
Jacob Pratt 2025-02-04 05:38:04 -05:00 • committed by GitHub
commit 1baf59e5f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
library/std/src/sys/pal/unix/fs.rs
View file

@ -740,29 +740,27 @@ impl Iterator for ReadDir {
// to `byte_offset` and thus does not require the full extent of `*entry_ptr` // to `byte_offset` and thus does not require the full extent of `*entry_ptr`
// to be in bounds of the same allocation, only the offset of the field // to be in bounds of the same allocation, only the offset of the field
// being referenced. // being referenced.
macro_rules! entry_field_ptr {
($field:ident) => {
&raw const (*entry_ptr).$field
};
}
// d_name is guaranteed to be null-terminated. // d_name is guaranteed to be null-terminated.
let name = CStr::from_ptr(entry_field_ptr!(d_name).cast()); let name = CStr::from_ptr((&raw const (*entry_ptr).d_name).cast());
let name_bytes = name.to_bytes(); let name_bytes = name.to_bytes();
if name_bytes == b"." || name_bytes == b".." { if name_bytes == b"." || name_bytes == b".." {
continue; continue;
} }
// When loading from a field, we can skip the `&raw const`; `(*entry_ptr).d_ino` as
// a value expression will do the right thing: `byte_offset` to the field and then
// only access those bytes.
#[cfg(not(target_os = "vita"))] #[cfg(not(target_os = "vita"))]
let entry = dirent64_min { let entry = dirent64_min {
d_ino: *entry_field_ptr!(d_ino) as u64, d_ino: (*entry_ptr).d_ino as u64,
#[cfg(not(any( #[cfg(not(any(
target_os = "solaris", target_os = "solaris",
target_os = "illumos", target_os = "illumos",
target_os = "aix", target_os = "aix",
target_os = "nto", target_os = "nto",
)))] )))]
d_type: *entry_field_ptr!(d_type) as u8, d_type: (*entry_ptr).d_type as u8,
}; };
#[cfg(target_os = "vita")] #[cfg(target_os = "vita")]