Skip to content

Commit

Permalink
Auto merge of #128962 - devnexen:fs_get_mode_haiku, r=workingjubilee
Browse files Browse the repository at this point in the history
std::fs: get_mode implementation for all unix
  • Loading branch information
bors committed Aug 13, 2024
2 parents 591ecb8 + 70e0f69 commit a2e1d15
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
27 changes: 0 additions & 27 deletions library/std/src/sys/pal/unix/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Submodule llvm-project updated 169 files

0 comments on commit a2e1d15

Please sign in to comment.