chore: wip

Author: dybucc

compiler/rustc_session/src/config/cfg.rs

@@ -69,7 +69,7 @@ impl<T: Eq + Hash> ExpectedValues<T> {
     }
 
     fn no_less(&mut self, value: T) {
-        if let ExpectedValues::BoundedBelow(ref mut bound) = self {
+        if let ExpectedValues::BoundedBelow(bound) = self {
             *bound = value.into();
         }
     }
@@ -87,7 +87,7 @@ impl<T: Eq + Hash> ExpectedValues<T> {
     }
 
     pub fn lower_bound(&self) -> Option<&T> {
-        if let ExpectedValues::BoundedBelow(bound) = self { bound } else { None }
+        if let ExpectedValues::BoundedBelow(bound) = self { bound.as_ref() } else { None }
     }
 }
 
@@ -463,7 +463,7 @@ impl CheckCfg {
 
             if self.exhaustive_values {
                 // Get all values map at once otherwise it would be costly.
-                // (8 values * 220 targets ~= 1760 times, at the time of writing this comment).
+                // (8 values * 220 targets =~ 1760 times, at the time of writing this comment).
                 let [
                     Some(values_target_abi),
                     Some(values_target_arch),
@@ -483,12 +483,14 @@ impl CheckCfg {
                     values_target_abi.insert(target.options.cfg_abi.desc_symbol());
                     values_target_arch.insert(target.arch.desc_symbol());
                     values_target_endian.insert(target.options.endian.desc_symbol());
-                    if target.options.os.desc() == "openbsd" {
-                        let openbsd_ver = target.options.env.bound().unwrap();
-                        values_target_env.lower_bound(sym::integer(openbsd_ver));
-                    } else {
-                        values_target_env.insert(target.options.env.desc_symbol());
-                    }
+                    target
+                        .options
+                        .env
+                        .bound()
+                        .and_then(|bound| {
+                            values_target_env.no_less(sym::integer(bound));
+                        })
+                        .or_else(|| values_target_env.insert(target.options.env.desc_symbol()));
                     values_target_family.extend(
                         target.options.families.iter().map(|family| Symbol::intern(family)),
                     );