Skip to content

/rust

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.

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

Conversation

Reviewers

@kennytm kennytm

Assignees

@sfackler sfackler

Labels
S-waiting-on-bors T-libs final-comment-period
Projects
None yet
Milestone
No milestone
@hedgehog1024
Copy link
Contributor

hedgehog1024 commented Feb 12, 2018 •
edited

Stabilize entry_and_modify feature introduced by #44734.

Closes #44733

hedgehog1024 added some commits Feb 12, 2018

@hedgehog1024
Stabilize 'entry_and_modify' feature for BTreeMap
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
770fded
@hedgehog1024
Stabilize 'entry_and_modify' feature for HashMap
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
862132b
@hedgehog1024
Delete information about 'entry_and_modify' from Unstable book
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4360dfa

@rust-highfive rust-highfive assigned cramertj Feb 12, 2018

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Feb 12, 2018

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 label Feb 12, 2018

@Centril Centril added the T-libs label Feb 13, 2018

@cramertj

This comment has been minimized.

Sign in to view
Copy link
Member

cramertj commented Feb 16, 2018

r? @sfackler

(Or someone else on libs)

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

@sfackler

This comment has been minimized.

Sign in to view
Copy link
Member

sfackler commented Feb 16, 2018

@rfcbot fcp merge
@rfcbot

This comment has been minimized.

Sign in to view
Copy link

rfcbot commented Feb 16, 2018 •
edited by withoutboats

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 final-comment-period and removed proposed-final-comment-period labels Feb 16, 2018

@rfcbot

This comment has been minimized.

Sign in to view
Copy link

rfcbot commented Feb 20, 2018

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

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 24, 2018

@bors: r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 24, 2018

📌 Commit 4360dfa has been approved by alexcrichton
@bors

This comment has been minimized.

Sign in to view
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 and removed S-waiting-on-review labels Feb 24, 2018

@kennytm

kennytm reviewed Feb 24, 2018
View 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")]

This comment has been minimized.

Sign in to view
Copy link
@kennytm

kennytm Feb 24, 2018

Member

The version number should be changed to 1.26.0
@Manishearth

This comment has been minimized.

Sign in to view
Copy link
Member

Manishearth commented Feb 25, 2018

(Fixed in an extra commit)
@kennytm

kennytm reviewed Feb 25, 2018
View 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")]

This comment has been minimized.

Sign in to view
Copy link
@kennytm

kennytm Feb 25, 2018 •
edited

Member

@Manishearth This also needs to be 1.26.0...

Whatever, I've fixed it myself.
@Manishearth @kennytm
1.25.0 -> 1.26.-
Verified
This commit was signed with a verified signature.
@kennytm kennytm
GPG key ID: FEF6C8051D0E013C Learn about signing commits
Loading status checks…
0aa753b

@kennytm kennytm force-pushed the hedgehog1024:hedgehog1024-stabilize-entry_and_modify branch from 94b7821 to 0aa753b Feb 25, 2018

@kennytm

This comment has been minimized.

Sign in to view
Copy link
Member

kennytm commented Feb 25, 2018

@bors r=alexcrichton
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 25, 2018

📌 Commit 0aa753b has been approved by alexcrichton
@bors

This comment has been minimized.

Sign in to view
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… 
…-entry_and_modify, r=alexcrichton

Stabilize 'entry_and_modify' feature

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

Closes rust-lang#44733
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
b443e57

@kennytm kennytm referenced this pull request Feb 25, 2018

Merged

Rollup of 17 pull requests #48531

bors added a commit that referenced this pull request Feb 25, 2018

@bors
Auto merge of #48531 - kennytm:rollup, r=kennytm 
Rollup of 16 pull requests

- Successful merges: #47964, #47970, #48076, #48115, #48166, #48281, #48297, #48302, #48330, #48362, #48369, #48489, #48491, #48494, #48517, #48529
- Failed merges:
Loading status checks…
a24cf59

bors added a commit that referenced this pull request Feb 25, 2018

@bors
Auto merge of #48531 - kennytm:rollup, r=kennytm 
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:
Loading status checks…
322d7f7

@bors bors merged commit 0aa753b into rust-lang:master Feb 25, 2018
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@hedgehog1024 hedgehog1024 deleted the hedgehog1024:hedgehog1024-stabilize-entry_and_modify branch Feb 27, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.