dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #128962 - devnexen:fs_get_mode_haiku, r=workingjubilee 

std::fs: get_mode implementation for all unix
This commit is contained in:
bors 2024-08-13 09:10:32 +00:00
parent 591ecb88df 70e0f69632
commit a2e1d154d5
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1552,17 +1552,6 @@ impl fmt::Debug for File {
None
}
#[cfg(any(
target_os = "linux",
target_os = "freebsd",
target_os = "hurd",
target_os = "netbsd",
target_os = "openbsd",
target_os = "vxworks",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
))]
fn get_mode(fd: c_int) -> Option<(bool, bool)> {
let mode = unsafe { libc::fcntl(fd, libc::F_GETFL) };
if mode == -1 {
@ -1576,22 +1565,6 @@ impl fmt::Debug for File {
}
}
#[cfg(not(any(
target_os = "linux",
target_os = "freebsd",
target_os = "hurd",
target_os = "netbsd",
target_os = "openbsd",
target_os = "vxworks",
target_os = "solaris",
target_os = "illumos",
target_vendor = "apple",
)))]
fn get_mode(_fd: c_int) -> Option<(bool, bool)> {
// FIXME(#24570): implement this for other Unix platforms
None
}
let fd = self.as_raw_fd();
let mut b = f.debug_struct("File");
b.field("fd", &fd);

2
src/llvm-project

@ -1 +1 @@
Subproject commit ccf4c38bdd73f1a37ec266c73bdaef80e39f8cf6
Subproject commit 57ae1a3474057fead2c438928ed368b3740bf0ec