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

Jump to bottom

Stabilize 'entry_and_modify' feature #48166

Merged
merged 4 commits into from
Feb 25, 2018
Merged

Stabilize 'entry_and_modify' feature #48166

merged 4 commits into from
Feb 25, 2018

Conversation

hedgehog1024
Copy link
Contributor

@hedgehog1024 hedgehog1024 commented Feb 12, 2018 •
edited
Loading

Stabilize entry_and_modify feature introduced by #44734.

Closes #44733

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cramertj (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@hedgehog1024 hedgehog1024 changed the title Merge 'hedgehog1024-stabilize-entry_and_modify' to local master branch Stabilize 'entry_and_modify' feature Feb 12, 2018
@pietroalbini pietroalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 12, 2018
@Centril Centril added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Feb 13, 2018
@cramertj
Copy link
Member

r? @sfackler

(Or someone else on libs)

@rust-highfive rust-highfive assigned sfackler and unassigned cramertj Feb 16, 2018
@sfackler
Copy link
Member

@rfcbot fcp merge

@rfcbot
Copy link

rfcbot commented Feb 16, 2018 •
edited by withoutboats
Loading

Team member @sfackler has proposed to merge this. The next step is review by the rest of the tagged teams:

No concerns currently listed.

Once a majority of reviewers approve (and none object), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Feb 16, 2018
@rfcbot
Copy link

rfcbot commented Feb 20, 2018

🔔 This is now entering its final comment period, as per the review above. 🔔

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 24, 2018

📌 Commit 4360dfa has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 24, 2018

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 24, 2018
kennytm
kennytm reviewed Feb 24, 2018
View reviewed changes
src/libstd/collections/hash/map.rs Outdated
@@ -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

@Manishearth
Copy link
Member

(Fixed in an extra commit)

kennytm
kennytm reviewed Feb 25, 2018
View reviewed changes
src/liballoc/btree/map.rs Outdated
@@ -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.

@kennytm kennytm force-pushed the hedgehog1024-stabilize-entry_and_modify branch from 94b7821 to 0aa753b Compare February 25, 2018 06:24
@kennytm
Copy link
Member

kennytm commented Feb 25, 2018

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Feb 25, 2018

📌 Commit 0aa753b has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 25, 2018

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

kennytm added a commit to kennytm/rust that referenced this pull request Feb 25, 2018
@kennytm
Rollup merge of rust-lang#48166 - hedgehog1024:hedgehog1024-stabilize…
b443e57 
…-entry_and_modify, r=alexcrichton

Stabilize 'entry_and_modify' feature

Stabilize `entry_and_modify` feature introduced by rust-lang#44734.

Closes rust-lang#44733
@kennytm kennytm mentioned this pull request Feb 25, 2018
Merged
bors added a commit that referenced this pull request Feb 25, 2018
@bors
Auto merge of #48531 - kennytm:rollup, r=kennytm
322d7f7 
Rollup of 17 pull requests

- Successful merges: #47964, #47970, #48076, #48115, #48166, #48281, #48297, #48302, #48362, #48369, #48489, #48491, #48494, #48517, #48529, #48235, #48330
- Failed merges:
@bors bors merged commit 0aa753b into rust-lang:master Feb 25, 2018
@hedgehog1024 hedgehog1024 deleted the hedgehog1024-stabilize-entry_and_modify branch February 27, 2018 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

Assignees

@sfackler sfackler

Labels
final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.