Skip to content

Stabilize 'entry_and_modify' feature - #48166

Merged
bors merged 4 commits into
rust-lang:masterfrom
hedgehog1024:hedgehog1024-stabilize-entry_and_modify
Feb 25, 2018
Merged

Stabilize 'entry_and_modify' feature#48166
bors merged 4 commits into
rust-lang:masterfrom
hedgehog1024:hedgehog1024-stabilize-entry_and_modify

Conversation

@hedgehog1024

@hedgehog1024hedgehog1024 commented Feb 12, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor

Stabilize entry_and_modify feature introduced by #44734.

Closes#44733

@rust-highfive

rust-highfive commented Feb 12, 2018

Copy link
Copy Markdown
Contributor

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.

@hedgehog1024hedgehog1024 changed the title Merge 'hedgehog1024-stabilize-entry_and_modify' to local master branchStabilize 'entry_and_modify' featureFeb 12, 2018
@emilyalbiniemilyalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 12, 2018
@CentrilCentril added the T-libs-api [DEPRECATED; DO NOT USE] label Feb 13, 2018
@cramertj

cramertj commented Feb 16, 2018

Copy link
Copy Markdown
Member

r? @sfackler

(Or someone else on libs)

@sfackler

sfackler commented Feb 16, 2018

Copy link
Copy Markdown
Member

@rfcbot fcp merge

@rfcbot

rfcbot commented Feb 16, 2018•
edited by withoutboats
Loading

Copy link
Copy Markdown

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.

@rfcbotrfcbot 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

rfcbot commented Feb 20, 2018

Copy link
Copy Markdown

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

@alexcrichton

alexcrichton commented Feb 24, 2018

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Feb 24, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 4360dfa has been approved by alexcrichton

@bors

bors commented Feb 24, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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
Comment threadsrc/libstd/collections/hash/map.rs Outdated
/// assert_eq!(map["poneyland"], 43);
/// ```
#[unstable(feature = "entry_and_modify", issue = "44733")]
#[stable(feature = "entry_and_modify", since = "1.25.0")]

@kennytmkennytmFeb 24, 2018

Copy link
Copy Markdown
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

Manishearth commented Feb 25, 2018

Copy link
Copy Markdown
Member

(Fixed in an extra commit)

kennytm
kennytm reviewed Feb 25, 2018
View reviewed changes
Comment threadsrc/liballoc/btree/map.rs Outdated

@kennytmkennytmFeb 25, 2018•
edited
Loading

Copy link
Copy Markdown
Member

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
kennytmforce-pushed the hedgehog1024-stabilize-entry_and_modify branch from 94b7821 to 0aa753bCompareFebruary 25, 2018 06:24
@kennytm

kennytm commented Feb 25, 2018

Copy link
Copy Markdown
Member

@bors r=alexcrichton

@bors

bors commented Feb 25, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 0aa753b has been approved by alexcrichton

@bors

bors commented Feb 25, 2018

Copy link
Copy Markdown
Collaborator

🌲 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 ofrust-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.
Closesrust-lang#44733
@kennytmkennytm 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:masterFeb 25, 2018
@hedgehog1024
hedgehog1024 deleted the hedgehog1024-stabilize-entry_and_modify branch February 27, 2018 16:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytmkennytmkennytm left review comments

Assignees

@sfacklersfackler

Labels

final-comment-periodIn the final comment period and will be merged soon unless new substantive objections are raised.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libs-api[DEPRECATED; DO NOT USE]

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@hedgehog1024@rust-highfive@cramertj@sfackler@rfcbot@alexcrichton@bors@Manishearth@kennytm@Centril@emilyalbini