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.

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 BTreeMap::remove_entry #70712

Merged
merged 1 commit into from
Apr 25, 2020
Merged

stabilize BTreeMap::remove_entry #70712

merged 1 commit into from
Apr 25, 2020

Conversation

DutchGhost
Copy link
Contributor

@DutchGhost DutchGhost commented Apr 2, 2020

This PR stabilizes BTreeMap::remove_entry as implemented in #68378.

Closes #66714

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 2, 2020
@jonas-schievink jonas-schievink added A-collections Area: std::collections. needs-fcp This change is insta-stable, so needs a completed FCP to proceed. relnotes Marks issues that should be documented in the release notes of the next release. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Apr 2, 2020
@jonas-schievink jonas-schievink added this to the 1.44 milestone Apr 2, 2020
@joshtriplett

This comment has been minimized.

@Mark-Simulacrum

This comment has been minimized.

@joshtriplett

This comment has been minimized.

@Amanieu
Copy link
Member

Amanieu commented Apr 3, 2020

@rfcbot fcp merge

@rfcbot
Copy link

rfcbot commented Apr 3, 2020

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

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), 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. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Apr 3, 2020
@rfcbot rfcbot added 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 Apr 15, 2020
@rfcbot
Copy link

rfcbot commented Apr 15, 2020

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

@Dylan-DPC-zz Dylan-DPC-zz modified the milestones: 1.44, 1.45 Apr 21, 2020
@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Apr 25, 2020
@rfcbot
Copy link

rfcbot commented Apr 25, 2020

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

@Amanieu
Copy link
Member

Amanieu commented Apr 25, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 25, 2020

📌 Commit 3f1a588 has been approved by Amanieu

@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 Apr 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#69041 (proc_macro: Stabilize `Span::resolved_at` and `Span::located_at`)
 - rust-lang#69813 (Implement BitOr and BitOrAssign for the NonZero integer types)
 - rust-lang#70712 (stabilize BTreeMap::remove_entry)
 - rust-lang#71168 (Deprecate `{Box,Rc,Arc}::into_raw_non_null`)
 - rust-lang#71544 (Replace filter_map().next() calls with find_map())
 - rust-lang#71545 (Fix comment in docstring example for Error::kind)
 - rust-lang#71548 (Add missing Send and Sync impls for linked list Cursor and CursorMut.)

Failed merges:

r? @ghost
@bors bors merged commit 29fd528 into rust-lang:master Apr 25, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 26, 2020
Fix stable(since) attribute for BTreeMap::remove_entry

Stabilized in rust-lang#70712.

Maybe checking that the since attributes are added correctly should be automated through tidy? This is the third PR I'm opening that fixes a stable(since) attribute for something meant to be stabilized in 1.43 / 1.44 initially but then only stabilized in 1.45. (the other two are rust-lang#71571, rust-lang#71574)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-collections Area: std::collections. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. needs-fcp This change is insta-stable, so needs a completed FCP to proceed. relnotes Marks issues that should be documented in the release notes of the next release. 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
Development

Successfully merging this pull request may close these issues.

Tracking issue for btreemap_remove_entry
9 participants