diff options
| author | bors <bors@rust-lang.org> | 2024-10-14 12:20:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-14 12:20:35 +0000 |
| commit | 17a19e684cdf3ca088af8b4da6a6209d128913f4 (patch) | |
| tree | c5079eb765379d0c131f40fd76365fd5d8a692c8 /library/std/src/sys/pal/unix/fs.rs | |
| parent | f6648f252a05a0a46c865d7ec836b46290613bf9 (diff) | |
| parent | d34b9324c0557abbcd52257fdc544e8a8ff77d4d (diff) | |
| download | rust-17a19e684cdf3ca088af8b4da6a6209d128913f4.tar.gz rust-17a19e684cdf3ca088af8b4da6a6209d128913f4.zip | |
Auto merge of #131672 - matthiaskrgr:rollup-gyzysj4, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- #128967 (std::fs::get_path freebsd update.)
- #130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
- #131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
- #131473 (compiler: `{TyAnd,}Layout` comes home)
- #131533 (emscripten: Use the latest emsdk 3.1.68)
- #131593 (miri: avoid cloning AllocExtra)
- #131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
- #131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/pal/unix/fs.rs')
| -rw-r--r-- | library/std/src/sys/pal/unix/fs.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs index e80299f1868..567577b2b4d 100644 --- a/library/std/src/sys/pal/unix/fs.rs +++ b/library/std/src/sys/pal/unix/fs.rs @@ -1538,7 +1538,7 @@ impl fmt::Debug for File { Some(PathBuf::from(OsString::from_vec(buf))) } - #[cfg(all(target_os = "freebsd", target_arch = "x86_64"))] + #[cfg(target_os = "freebsd")] fn get_path(fd: c_int) -> Option<PathBuf> { let info = Box::<libc::kinfo_file>::new_zeroed(); let mut info = unsafe { info.assume_init() }; @@ -1566,7 +1566,7 @@ impl fmt::Debug for File { #[cfg(not(any( target_os = "linux", target_os = "vxworks", - all(target_os = "freebsd", target_arch = "x86_64"), + target_os = "freebsd", target_os = "netbsd", target_os = "illumos", target_os = "solaris", |