bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #94105 - 5225225:destabilise-entry-insert, r=Mark-Simulacrum

Browse source 
Destabilise entry_insert

See: https://github.com/rust-lang/rust/pull/90345

I didn't revert the rename that was done in that PR, I left it as `entry_insert`.

Additionally, before that PR, `VacantEntry::insert_entry` seemingly had no stability attribute on it? I kept the attribute, just made it an unstable one, same as the one on `Entry`.

There didn't seem to be any mention of this in the RELEASES.md, so I don't think there's anything for me to do other than this?
This commit is contained in:
bors 2022-02-19 05:08:13 +00:00
commit cb4ee81ef5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2472,6 +2472,7 @@ impl<'a, K, V> Entry<'a, K, V> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(entry_insert)]
/// use std::collections::HashMap; /// use std::collections::HashMap;
/// ///
/// let mut map: HashMap<&str, String> = HashMap::new(); /// let mut map: HashMap<&str, String> = HashMap::new();
@ -2480,7 +2481,7 @@ impl<'a, K, V> Entry<'a, K, V> {
/// assert_eq!(entry.key(), &"poneyland"); /// assert_eq!(entry.key(), &"poneyland");
/// ``` /// ```
#[inline] #[inline]
#[stable(feature = "entry_insert", since = "1.59.0")] #[unstable(feature = "entry_insert", issue = "65225")]
pub fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V> { pub fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V> {
match self { match self {
Occupied(mut entry) => { Occupied(mut entry) => {
@ -2814,6 +2815,7 @@ impl<'a, K: 'a, V: 'a> VacantEntry<'a, K, V> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(entry_insert)]
/// use std::collections::HashMap; /// use std::collections::HashMap;
/// use std::collections::hash_map::Entry; /// use std::collections::hash_map::Entry;
/// ///
@ -2825,7 +2827,7 @@ impl<'a, K: 'a, V: 'a> VacantEntry<'a, K, V> {
/// assert_eq!(map["poneyland"], 37); /// assert_eq!(map["poneyland"], 37);
/// ``` /// ```
#[inline] #[inline]
#[stable(feature = "entry_insert", since = "1.59.0")] #[unstable(feature = "entry_insert", issue = "65225")]
pub fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V> { pub fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V> {
let base = self.base.insert_entry(value); let base = self.base.insert_entry(value);
OccupiedEntry { base } OccupiedEntry { base }