nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-17 01:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS/tvOS/watchOS/visionOS: Improve File Debug impl

Browse Source 
This uses `libc::fcntl`, which, while not explicitly marked as available
in the headers, is already used by `File::sync_all` and `File::sync_data`
on these platforms, so should be fine to use here as well.
This commit is contained in:
Mads Marquart 2024-05-06 08:20:48 +02:00
parent 28622c9e52
commit ff41c99bb8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/std/src/sys/pal/unix/fs.rs
View File

@ -1493,11 +1493,11 @@ impl fmt::Debug for File {
readlink(&p).ok() readlink(&p).ok()
} }
#[cfg(target_os = "macos")] #[cfg(target_vendor = "apple")]
fn get_path(fd: c_int) -> Option<PathBuf> { fn get_path(fd: c_int) -> Option<PathBuf> {
// FIXME: The use of PATH_MAX is generally not encouraged, but it // FIXME: The use of PATH_MAX is generally not encouraged, but it
// is inevitable in this case because macOS defines `fcntl` with // is inevitable in this case because Apple targets define `fcntl`
// `F_GETPATH` in terms of `MAXPATHLEN`, and there are no // with `F_GETPATH` in terms of `MAXPATHLEN`, and there are no
// alternatives. If a better method is invented, it should be used // alternatives. If a better method is invented, it should be used
// instead. // instead.
let mut buf = vec![0; libc::PATH_MAX as usize]; let mut buf = vec![0; libc::PATH_MAX as usize];
@ -1538,12 +1538,12 @@ impl fmt::Debug for File {
#[cfg(not(any( #[cfg(not(any(
target_os = "linux", target_os = "linux",
target_os = "macos",
target_os = "vxworks", target_os = "vxworks",
all(target_os = "freebsd", target_arch = "x86_64"), all(target_os = "freebsd", target_arch = "x86_64"),
target_os = "netbsd", target_os = "netbsd",
target_os = "illumos", target_os = "illumos",
target_os = "solaris" target_os = "solaris",
target_vendor = "apple",
)))] )))]
fn get_path(_fd: c_int) -> Option<PathBuf> { fn get_path(_fd: c_int) -> Option<PathBuf> {
// FIXME(#24570): implement this for other Unix platforms // FIXME(#24570): implement this for other Unix platforms
@ -1552,12 +1552,12 @@ impl fmt::Debug for File {
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_os = "macos",
target_os = "freebsd", target_os = "freebsd",
target_os = "hurd", target_os = "hurd",
target_os = "netbsd", target_os = "netbsd",
target_os = "openbsd", target_os = "openbsd",
target_os = "vxworks" target_os = "vxworks",
target_vendor = "apple",
))] ))]
fn get_mode(fd: c_int) -> Option<(bool, bool)> { fn get_mode(fd: c_int) -> Option<(bool, bool)> {
let mode = unsafe { libc::fcntl(fd, libc::F_GETFL) }; let mode = unsafe { libc::fcntl(fd, libc::F_GETFL) };
@ -1574,12 +1574,12 @@ impl fmt::Debug for File {
#[cfg(not(any( #[cfg(not(any(
target_os = "linux", target_os = "linux",
target_os = "macos",
target_os = "freebsd", target_os = "freebsd",
target_os = "hurd", target_os = "hurd",
target_os = "netbsd", target_os = "netbsd",
target_os = "openbsd", target_os = "openbsd",
target_os = "vxworks" target_os = "vxworks",
target_vendor = "apple",
)))] )))]
fn get_mode(_fd: c_int) -> Option<(bool, bool)> { fn get_mode(_fd: c_int) -> Option<(bool, bool)> {
// FIXME(#24570): implement this for other Unix platforms // FIXME(#24570): implement this for other Unix platforms