From ee35b1848eb3f24369bb52d34cc5bfb6e98284bf Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Tue, 17 Sep 2019 17:04:49 +0200
Subject: [PATCH] Simplify the std imports

---
 library/stdarch/crates/std_detect/src/lib.rs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/library/stdarch/crates/std_detect/src/lib.rs b/library/stdarch/crates/std_detect/src/lib.rs
index 9f4b9918e7a5..bb70baaf61ae 100644
--- a/library/stdarch/crates/std_detect/src/lib.rs
+++ b/library/stdarch/crates/std_detect/src/lib.rs
@@ -24,23 +24,12 @@
 extern crate cfg_if;
 
 cfg_if! {
-    if #[cfg(all(feature = "std_detect_file_io", feature = "std_detect_env_override"))] {
+    if #[cfg(any(feature = "std_detect_file_io", feature = "std_detect_env_override"))] {
         #[cfg_attr(test, macro_use(println))]
         extern crate std;
 
         #[allow(unused_imports)]
         use std::{arch, env, fs, io, mem, sync};
-    } else if #[cfg(feature = "std_detect_file_io")] {
-        #[cfg_attr(test, macro_use(println))]
-        extern crate std;
-
-        #[allow(unused_imports)]
-        use std::{arch, fs, io, mem, sync};
-    } else if #[cfg(feature = "std_detect_env_override")] {
-        #[cfg_attr(test, macro_use(println))]
-        extern crate std;
-
-        use std::env;
     } else {
         #[cfg(test)]
         #[macro_use(println)]