about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Carlier <devnexen@gmail.com>2024-08-12 23:44:42 +0100
committerDavid Carlier <devnexen@gmail.com>2024-08-12 23:44:42 +0100
commit70e0f69632591add54bc1e4d625e7bbb9fa02095 (patch)
treed697586f65f2854efcfd775de5519ba8cd558392
parenta7be5bf683be4b69cc92e42bc2ae695724dc47e0 (diff)
downloadrust-70e0f69632591add54bc1e4d625e7bbb9fa02095.tar.gz
rust-70e0f69632591add54bc1e4d625e7bbb9fa02095.zip
trying common codepath for every unixes
-rw-r--r--library/std/src/sys/pal/unix/fs.rs29
m---------src/llvm-project0
2 files changed, 0 insertions, 29 deletions
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs
index ff7ee4fdfa8..be13e1ae9b3 100644
--- a/library/std/src/sys/pal/unix/fs.rs
+++ b/library/std/src/sys/pal/unix/fs.rs
@@ -1552,18 +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_os = "haiku",
-            target_vendor = "apple",
-        ))]
         fn get_mode(fd: c_int) -> Option<(bool, bool)> {
             let mode = unsafe { libc::fcntl(fd, libc::F_GETFL) };
             if mode == -1 {
@@ -1577,23 +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_os = "haiku",
-            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);
diff --git a/src/llvm-project b/src/llvm-project
-Subproject ccf4c38bdd73f1a37ec266c73bdaef80e39f8cf
+Subproject 57ae1a3474057fead2c438928ed368b3740bf0e