bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize HashMap::get_many_mut as HashMap::get_disjoint_mut

Browse source 
as well as `HashMap::get_many_unchecked_mut` to
`HashMap::get_disjoint_unchecked_mut`.
This commit is contained in:
Urgau 2025-01-27 19:28:12 +01:00
parent f753850659
commit 885278b9eb
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
library/std/src/collections/hash/map.rs
View file

@ -969,7 +969,6 @@ where
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(map_many_mut)]
/// use std::collections::HashMap; /// use std::collections::HashMap;
/// ///
/// let mut libraries = HashMap::new(); /// let mut libraries = HashMap::new();
@ -979,13 +978,13 @@ where
/// libraries.insert("Library of Congress".to_string(), 1800); /// libraries.insert("Library of Congress".to_string(), 1800);
/// ///
/// // Get Athenæum and Bodleian Library /// // Get Athenæum and Bodleian Library
/// let [Some(a), Some(b)] = libraries.get_many_mut([ /// let [Some(a), Some(b)] = libraries.get_disjoint_mut([
/// "Athenæum", /// "Athenæum",
/// "Bodleian Library", /// "Bodleian Library",
/// ]) else { panic!() }; /// ]) else { panic!() };
/// ///
/// // Assert values of Athenæum and Library of Congress /// // Assert values of Athenæum and Library of Congress
/// let got = libraries.get_many_mut([ /// let got = libraries.get_disjoint_mut([
/// "Athenæum", /// "Athenæum",
/// "Library of Congress", /// "Library of Congress",
/// ]); /// ]);
@ -998,7 +997,7 @@ where
/// ); /// );
/// ///
/// // Missing keys result in None /// // Missing keys result in None
/// let got = libraries.get_many_mut([ /// let got = libraries.get_disjoint_mut([
/// "Athenæum", /// "Athenæum",
/// "New York Public Library", /// "New York Public Library",
/// ]); /// ]);
@ -1012,21 +1011,24 @@ where
/// ``` /// ```
/// ///
/// ```should_panic /// ```should_panic
/// #![feature(map_many_mut)]
/// use std::collections::HashMap; /// use std::collections::HashMap;
/// ///
/// let mut libraries = HashMap::new(); /// let mut libraries = HashMap::new();
/// libraries.insert("Athenæum".to_string(), 1807); /// libraries.insert("Athenæum".to_string(), 1807);
/// ///
/// // Duplicate keys panic! /// // Duplicate keys panic!
/// let got = libraries.get_many_mut([ /// let got = libraries.get_disjoint_mut([
/// "Athenæum", /// "Athenæum",
/// "Athenæum", /// "Athenæum",
/// ]); /// ]);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "map_many_mut", issue = "97601")] #[doc(alias = "get_many_mut")]
pub fn get_many_mut<Q: ?Sized, const N: usize>(&mut self, ks: [&Q; N]) -> [Option<&'_ mut V>; N] #[stable(feature = "map_many_mut", since = "CURRENT_RUSTC_VERSION")]
pub fn get_disjoint_mut<Q: ?Sized, const N: usize>(
&mut self,
ks: [&Q; N],
) -> [Option<&'_ mut V>; N]
where where
K: Borrow<Q>, K: Borrow<Q>,
Q: Hash + Eq, Q: Hash + Eq,
@ -1040,7 +1042,7 @@ where
/// Returns an array of length `N` with the results of each query. `None` will be used if /// Returns an array of length `N` with the results of each query. `None` will be used if
/// the key is missing. /// the key is missing.
/// ///
/// For a safe alternative see [`get_many_mut`](`HashMap::get_many_mut`). /// For a safe alternative see [`get_disjoint_mut`](`HashMap::get_disjoint_mut`).
/// ///
/// # Safety /// # Safety
/// ///
@ -1052,7 +1054,6 @@ where
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(map_many_mut)]
/// use std::collections::HashMap; /// use std::collections::HashMap;
/// ///
/// let mut libraries = HashMap::new(); /// let mut libraries = HashMap::new();
@ -1062,13 +1063,13 @@ where
/// libraries.insert("Library of Congress".to_string(), 1800); /// libraries.insert("Library of Congress".to_string(), 1800);
/// ///
/// // SAFETY: The keys do not overlap. /// // SAFETY: The keys do not overlap.
/// let [Some(a), Some(b)] = (unsafe { libraries.get_many_unchecked_mut([ /// let [Some(a), Some(b)] = (unsafe { libraries.get_disjoint_unchecked_mut([
/// "Athenæum", /// "Athenæum",
/// "Bodleian Library", /// "Bodleian Library",
/// ]) }) else { panic!() }; /// ]) }) else { panic!() };
/// ///
/// // SAFETY: The keys do not overlap. /// // SAFETY: The keys do not overlap.
/// let got = unsafe { libraries.get_many_unchecked_mut([ /// let got = unsafe { libraries.get_disjoint_unchecked_mut([
/// "Athenæum", /// "Athenæum",
/// "Library of Congress", /// "Library of Congress",
/// ]) }; /// ]) };
@ -1081,7 +1082,7 @@ where
/// ); /// );
/// ///
/// // SAFETY: The keys do not overlap. /// // SAFETY: The keys do not overlap.
/// let got = unsafe { libraries.get_many_unchecked_mut([ /// let got = unsafe { libraries.get_disjoint_unchecked_mut([
/// "Athenæum", /// "Athenæum",
/// "New York Public Library", /// "New York Public Library",
/// ]) }; /// ]) };
@ -1089,8 +1090,9 @@ where
/// assert_eq!(got, [Some(&mut 1807), None]); /// assert_eq!(got, [Some(&mut 1807), None]);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "map_many_mut", issue = "97601")] #[doc(alias = "get_many_unchecked_mut")]
pub unsafe fn get_many_unchecked_mut<Q: ?Sized, const N: usize>( #[stable(feature = "map_many_mut", since = "CURRENT_RUSTC_VERSION")]
pub unsafe fn get_disjoint_unchecked_mut<Q: ?Sized, const N: usize>(
&mut self, &mut self,
ks: [&Q; N], ks: [&Q; N],
) -> [Option<&'_ mut V>; N] ) -> [Option<&'_ mut V>; N]