Remove std_detect_env_override

Author: Amanieu

crates/std_detect/src/detect/cache.rs

@@ -121,31 +121,11 @@ impl Cache {
     }
 }
 
-cfg_if::cfg_if! {
-    if #[cfg(feature = "std_detect_env_override")] {
-        #[inline]
-        fn initialize(mut value: Initializer) -> Initializer {
-            if let Ok(disable) = crate::env::var("RUST_STD_DETECT_UNSTABLE") {
-                for v in disable.split(" ") {
-                    let _ = super::Feature::from_str(v).map(|v| value.unset(v as u32));
-                }
-            }
-            do_initialize(value);
-            value
-        }
-    } else {
-        #[inline]
-        fn initialize(value: Initializer) -> Initializer {
-            do_initialize(value);
-            value
-        }
-    }
-}
-
 #[inline]
-fn do_initialize(value: Initializer) {
+fn initialize(value: Initializer) -> Initializer {
     CACHE[0].initialize((value.0) as usize & Cache::MASK);
     CACHE[1].initialize((value.0 >> Cache::CAPACITY) as usize & Cache::MASK);
+    value
 }
 
 // We only have to detect features once, and it's fairly costly, so hint to LLVM
@@ -170,10 +150,6 @@ fn detect_and_initialize() -> Initializer {
 ///
 /// It uses the `Feature` variant to index into this variable as a bitset. If
 /// the bit is set, the feature is enabled, and otherwise it is disabled.
-///
-/// If the feature `std_detect_env_override` is enabled looks for the env
-/// variable `RUST_STD_DETECT_UNSTABLE` and uses its its content to disable
-/// Features that would had been otherwise detected.
 #[inline]
 pub(crate) fn test(bit: u32) -> bool {
     let (relative_bit, idx) = if bit < Cache::CAPACITY {

crates/std_detect/src/detect/macros.rs

@@ -69,13 +69,6 @@ macro_rules! features {
                     Feature::_last => unreachable!(),
                 }
             }
-            #[cfg(feature = "std_detect_env_override")]
-            pub(crate) fn from_str(s: &str) -> Result<Feature, ()> {
-                match s {
-                    $($feature_lit => Ok(Feature::$feature),)*
-                    _ => Err(())
-                }
-            }
         }
 
         /// Each function performs run-time feature detection for a single

crates/std_detect/src/lib.rs

@@ -21,7 +21,7 @@
 #![no_std]
 
 cfg_if::cfg_if! {
-    if #[cfg(any(feature = "std_detect_file_io", feature = "std_detect_env_override"))] {
+    if #[cfg(feature = "std_detect_file_io")] {
         #[cfg_attr(test, macro_use(println))]
         extern crate std;
 

crates/std_detect/tests/x86-specific.rs

@@ -69,29 +69,6 @@ fn dump() {
     println!("rtm: {:?}", is_x86_feature_detected!("rtm"));
 }
 
-#[cfg(feature = "std_detect_env_override")]
-#[test]
-fn env_override_no_avx() {
-    if let Ok(disable) = std::env::var("RUST_STD_DETECT_UNSTABLE") {
-        let information = cupid::master().unwrap();
-        for d in disable.split(" ") {
-            match d {
-                "avx" => {
-                    if information.avx() {
-                        assert_ne!(is_x86_feature_detected!("avx"), information.avx())
-                    }
-                }
-                "avx2" => {
-                    if information.avx2() {
-                        assert_ne!(is_x86_feature_detected!("avx2"), information.avx2())
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-}
-
 #[test]
 fn compare_with_cupid() {
     let information = cupid::master().unwrap();