about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHans Kratz <hans@appfour.com>2022-01-20 13:32:57 +0100
committerPietro Albini <pietro.albini@ferrous-systems.com>2022-01-20 13:38:23 +0100
commit1c63ec48b8cbf553d291a04957d86cfd191fcd78 (patch)
treea98bf43bbe5f15b6c328622a8f688d5e3c9dc597
parent68976d1ac1718311bf6125e137747f61226638db (diff)
downloadrust-1c63ec48b8cbf553d291a04957d86cfd191fcd78.tar.gz
rust-1c63ec48b8cbf553d291a04957d86cfd191fcd78.zip
Better fix for Fuchsia
-rw-r--r--library/std/src/sys/unix/fs.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
index 24c1be329b4..111639d92b7 100644
--- a/library/std/src/sys/unix/fs.rs
+++ b/library/std/src/sys/unix/fs.rs
@@ -1628,20 +1628,13 @@ mod remove_dir_impl {
         target_os = "solaris",
         target_os = "illumos",
         target_os = "haiku",
-        target_os = "vxworks"
+        target_os = "vxworks",
+        target_os = "fuchsia"
     ))]
     fn is_dir(_ent: &DirEntry) -> Option<bool> {
         None
     }
 
-    #[cfg(target_os = "fuchsia")]
-    fn is_dir(ent: &DirEntry) -> Option<bool> {
-        match ent.entry.d_type {
-            libc::DT_DIR => Some(true),
-            _ => Some(false),
-        }
-    }
-
     #[cfg(not(any(
         target_os = "solaris",
         target_os = "illumos",