Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stabilize 'entry_and_modify' feature #48166

Merged
merged 4 commits into from
Feb 25, 2018
Merged

Stabilize 'entry_and_modify' feature #48166

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
770fded
Stabilize 'entry_and_modify' feature for BTreeMap
hedgehog1024 Feb 12, 2018
862132b
Stabilize 'entry_and_modify' feature for HashMap
hedgehog1024 Feb 12, 2018
4360dfa
Delete information about 'entry_and_modify' from Unstable book
hedgehog1024 Feb 12, 2018
0aa753b
1.25.0 -> 1.26.-
Manishearth Feb 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions src/doc/unstable-book/src/library-features/entry-and-modify.md
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/liballoc/btree/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,7 +2114,6 @@ impl<'a, K: Ord, V> Entry<'a, K, V> {
/// # Examples
///
/// ```
/// #![feature(entry_and_modify)]
/// use std::collections::BTreeMap;
///
/// let mut map: BTreeMap<&str, usize> = BTreeMap::new();
Expand All @@ -2129,7 +2128,7 @@ impl<'a, K: Ord, V> Entry<'a, K, V> {
/// .or_insert(42);
/// assert_eq!(map["poneyland"], 43);
/// ```
#[unstable(feature = "entry_and_modify", issue = "44733")]
#[stable(feature = "entry_and_modify", since = "1.25.0")]
Copy link
Member

@kennytm kennytm Feb 25, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Manishearth This also needs to be 1.26.0...

Whatever, I've fixed it myself.

pub fn and_modify<F>(self, mut f: F) -> Self
where F: FnMut(&mut V)
{
Expand Down
3 changes: 1 addition & 2 deletions src/libstd/collections/hash/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2066,7 +2066,6 @@ impl<'a, K, V> Entry<'a, K, V> {
/// # Examples
///
/// ```
/// #![feature(entry_and_modify)]
/// use std::collections::HashMap;
///
/// let mut map: HashMap<&str, u32> = HashMap::new();
Expand All @@ -2081,7 +2080,7 @@ impl<'a, K, V> Entry<'a, K, V> {
/// .or_insert(42);
/// assert_eq!(map["poneyland"], 43);
/// ```
#[unstable(feature = "entry_and_modify", issue = "44733")]
#[stable(feature = "entry_and_modify", since = "1.25.0")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version number should be changed to 1.26.0

pub fn and_modify<F>(self, mut f: F) -> Self
where F: FnMut(&mut V)
{
Expand Down