From 1d06b07765e1be71f3aeec1d0c0f365b0907c7a8 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Fri, 9 Oct 2020 10:54:50 -0700
Subject: [PATCH] simplify the cfg in ReadDir construction

Co-authored-by: David Tolnay <dtolnay@gmail.com>
---
 library/std/src/sys/unix/fs.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
index 2c7a7e55d0e..8184c25afcf 100644
--- a/library/std/src/sys/unix/fs.rs
+++ b/library/std/src/sys/unix/fs.rs
@@ -949,18 +949,16 @@ pub fn readdir(p: &Path) -> io::Result<ReadDir> {
             Err(Error::last_os_error())
         } else {
             let inner = InnerReadDir { dirp: Dir(ptr), root };
-            cfg_if::cfg_if! {
-                if #[cfg(not(any(
+            Ok(ReadDir {
+                inner: Arc::new(inner),
+                #[cfg(not(any(
                     target_os = "solaris",
                     target_os = "illumos",
                     target_os = "fuchsia",
                     target_os = "redox",
-                )))] {
-                    Ok(ReadDir { inner: Arc::new(inner), end_of_stream: false })
-                } else {
-                    Ok(ReadDir { inner: Arc::new(inner) })
-                }
-            }
+                )))]
+                end_of_stream: false,
+            })
         }
     }
 }