Auto merge of #51079 - GuillaumeGomez:stabilize-entry-or-default, r=SimonSapin

Stabilize entry-or-default

Fixes #44324.

cc @SimonSapin
This commit is contained in:
bors 2018-06-10 12:46:14 +00:00
commit 900037e3c3
4 changed files with 2 additions and 19 deletions

View File

@ -1,13 +0,0 @@
# `entry_or_default`
The tracking issue for this feature is: [#44324]
[#44324]: https://github.com/rust-lang/rust/issues/44324
------------------------
The `entry_or_default` feature adds a new method to `hash_map::Entry`
and `btree_map::Entry`, `or_default`, when `V: Default`. This method is
semantically identical to `or_insert_with(Default::default)`, and will
insert the default value for the type if no entry exists for the current
key.

View File

@ -2184,14 +2184,13 @@ impl<'a, K: Ord, V> Entry<'a, K, V> {
}
impl<'a, K: Ord, V: Default> Entry<'a, K, V> {
#[unstable(feature = "entry_or_default", issue = "44324")]
#[stable(feature = "entry_or_default", since = "1.28.0")]
/// Ensures a value is in the entry by inserting the default value if empty,
/// and returns a mutable reference to the value in the entry.
///
/// # Examples
///
/// ```
/// #![feature(entry_or_default)]
/// # fn main() {
/// use std::collections::BTreeMap;
///

View File

@ -45,7 +45,6 @@
#![feature(const_fn)]
#![feature(core_intrinsics)]
#![feature(drain_filter)]
#![feature(entry_or_default)]
#![feature(from_ref)]
#![feature(fs_read_write)]
#![feature(iterator_find_map)]

View File

@ -2161,14 +2161,13 @@ impl<'a, K, V> Entry<'a, K, V> {
}
impl<'a, K, V: Default> Entry<'a, K, V> {
#[unstable(feature = "entry_or_default", issue = "44324")]
#[stable(feature = "entry_or_default", since = "1.28.0")]
/// Ensures a value is in the entry by inserting the default value if empty,
/// and returns a mutable reference to the value in the entry.
///
/// # Examples
///
/// ```
/// #![feature(entry_or_default)]
/// # fn main() {
/// use std::collections::HashMap;
///
@ -2184,7 +2183,6 @@ impl<'a, K, V: Default> Entry<'a, K, V> {
Vacant(entry) => entry.insert(Default::default()),
}
}
}
impl<'a, K, V> OccupiedEntry<'a, K, V> {