about summary refs log tree commit diff
path: root/library/stdarch/crates/std_detect
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2019-09-17 17:04:49 +0200
committerLuca Barbato <lu_zero@gentoo.org>2019-09-17 19:22:18 +0200
commitee35b1848eb3f24369bb52d34cc5bfb6e98284bf (patch)
tree9ee1bb54b2c2b37ca54069eff4fd2e1b65356d37 /library/stdarch/crates/std_detect
parent33688eaa1048c9d2a13e2d53f9e9ff9727f1de0b (diff)
downloadrust-ee35b1848eb3f24369bb52d34cc5bfb6e98284bf.tar.gz
rust-ee35b1848eb3f24369bb52d34cc5bfb6e98284bf.zip
Simplify the std imports
Diffstat (limited to 'library/stdarch/crates/std_detect')
-rw-r--r--library/stdarch/crates/std_detect/src/lib.rs13
1 files changed, 1 insertions, 12 deletions
diff --git a/library/stdarch/crates/std_detect/src/lib.rs b/library/stdarch/crates/std_detect/src/lib.rs
index 9f4b9918e7a..bb70baaf61a 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)]