Adjust compiler for HashMap::get_many_mut stabilization

rust-lang · Jan 27, 2025 · 737e301 · 737e301
1 parent 885278b
commit 737e301
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/compiler/rustc_session/src/config/cfg.rs b/compiler/rustc_session/src/config/cfg.rs
@@ -410,6 +410,11 @@ impl CheckCfg {
             }
 
             if self.exhaustive_values {
+                #[cfg(not(bootstrap))]
+                let values = self.expecteds.get_disjoint_mut(VALUES);
+                #[cfg(bootstrap)]
+                let values = self.expecteds.get_many_mut(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).
                 let [
@@ -421,7 +426,7 @@ impl CheckCfg {
                     Some(values_target_os),
                     Some(values_target_pointer_width),
                     Some(values_target_vendor),
-                ] = self.expecteds.get_many_mut(VALUES)
+                ] = values
                 else {
                     panic!("unable to get all the check-cfg values buckets");
                 };

diff --git a/compiler/rustc_session/src/lib.rs b/compiler/rustc_session/src/lib.rs
@@ -1,8 +1,8 @@
 // tidy-alphabetical-start
 #![allow(internal_features)]
+#![cfg_attr(bootstrap, feature(map_many_mut))]
 #![feature(iter_intersperse)]
 #![feature(let_chains)]
-#![feature(map_many_mut)]
 #![feature(rustc_attrs)]
 #![warn(unreachable_pub)]
 // tidy-alphabetical-end