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 peekable_peek_mut #81938

Merged
merged 5 commits into from
Apr 8, 2021
Merged

Stabilize peekable_peek_mut #81938

merged 5 commits into from
Apr 8, 2021

Conversation

lukaslueg
Copy link
Contributor

Resolves #78302. Also adds some documentation on std::iter::Iterator::peekable() regarding the new method.

The feature was added in #77491 in Nov' 20, which is recently, but the feature seems reasonably small. Never did a stabilization-pr, excuse my ignorance if there is a protocol I'm not aware of.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 Feb 9, 2021
@jonas-schievink jonas-schievink added 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 Feb 9, 2021
@bors
Copy link
Contributor

bors commented Feb 13, 2021

☔ The latest upstream changes (presumably #82045) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

r? @KodrAus

@bors
Copy link
Contributor

bors commented Feb 18, 2021

☔ The latest upstream changes (presumably #81172) made this pull request unmergeable. Please resolve the merge conflicts.

KodrAus
KodrAus reviewed Feb 21, 2021
View reviewed changes
Copy link
Contributor

@KodrAus KodrAus left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @lukaslueg! 🙇

I hope you don't mind I've just pushed a couple commits to your branch to fix a merge conflict and update the stable version to 1.52.0.

Would you be happy to squash these commits down?

r=me after that

library/core/src/iter/traits/iterator.rs Outdated Show resolved Hide resolved
@lukaslueg
Copy link
Contributor Author

Squashed it all

@lukaslueg
Copy link
Contributor Author

ping @KodrAus

@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 16, 2021
JohnTitor
JohnTitor reviewed Mar 17, 2021
View reviewed changes
library/core/src/iter/traits/iterator.rs Outdated Show resolved Hide resolved
library/core/src/iter/traits/iterator.rs Outdated Show resolved Hide resolved
@JohnTitor
Copy link
Member

Thanks!
So, since @KodrAus said r=me before and the next release will happen soon, I'm going to approve not to slip down.
@bors r=KodrAus,JohnTitor

@bors
Copy link
Contributor

bors commented Mar 17, 2021

📌 Commit 8af15db has been approved by KodrAus,JohnTitor

@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 Mar 17, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 17, 2021
@Dylan-DPC
Rollup merge of rust-lang#81938 - lukaslueg:stab_peek_mut, r=KodrAus,…
03abd47 
…JohnTitor

Stabilize `peekable_peek_mut`

Resolves rust-lang#78302. Also adds some documentation on `std::iter::Iterator::peekable()` regarding the new method.

The feature was added in rust-lang#77491 in Nov' 20, which is recently, but the feature seems reasonably small. Never did a stabilization-pr, excuse my ignorance if there is a protocol I'm not aware of.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 17, 2021
Closed
@lukaslueg
Copy link
Contributor Author

Isn't there usually a vote on stabilizing things, especially since this indirectly affects Iterator?

@JohnTitor
Copy link
Member

Isn't there usually a vote on stabilizing things, especially since this indirectly affects Iterator?

Hm, I thought they meant we didn't require it, @KodrAus is it wrong?

@Mark-Simulacrum
Copy link
Member

@bors r- I'd rather we don't accidentally stabilize, and I think an FCP seems appropriate here.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2021
@lukaslueg @KodrAus
Stabilize peekable_peek_mut
abcbe54 
Resolves rust-lang#78302

Update peekable.rs

Update library/core/src/iter/traits/iterator.rs

Co-authored-by: Ashley Mannix <[email protected]>
@lukaslueg
Copy link
Contributor Author

Rebased due to #83349

@m-ou-se m-ou-se mentioned this pull request Mar 27, 2021
Closed
2 tasks
@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 Mar 27, 2021
@rfcbot
Copy link

rfcbot commented Mar 27, 2021

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

@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Apr 6, 2021
@rfcbot
Copy link

rfcbot commented Apr 6, 2021

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 7, 2021

It seems that the review suggestions by @JohnTitor didn't actually get applied?

@lukaslueg
Copy link
Contributor Author

It seems that the review suggestions by @JohnTitor didn't actually get applied?

👀 Thanks for spotting this. I have no idea why these commits slipped through, maybe during rebase.

@apiraino apiraino removed the to-announce Announce this issue on triage meeting label Apr 8, 2021
@Amanieu
Copy link
Member

Amanieu commented Apr 8, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 8, 2021

📌 Commit cfe43f9 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 8, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 8, 2021
@Dylan-DPC
Rollup merge of rust-lang#81938 - lukaslueg:stab_peek_mut, r=Amanieu
5f6fb2c 
Stabilize `peekable_peek_mut`

Resolves rust-lang#78302. Also adds some documentation on `std::iter::Iterator::peekable()` regarding the new method.

The feature was added in rust-lang#77491 in Nov' 20, which is recently, but the feature seems reasonably small. Never did a stabilization-pr, excuse my ignorance if there is a protocol I'm not aware of.
This was referenced Apr 8, 2021
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2021
@bors
Auto merge of rust-lang#84008 - Dylan-DPC:rollup-invxvg8, r=Dylan-DPC
2e495d2 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#80733 (Improve links in inline code in `core::pin`.)
 - rust-lang#81764 (Stabilize `rustdoc::bare_urls` lint)
 - rust-lang#81938 (Stabilize `peekable_peek_mut`)
 - rust-lang#83980 (Fix outdated crate names in compiler docs)
 - rust-lang#83992 (Merge idents when generating source content)
 - rust-lang#84001 (Update Clippy)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 461297e into rust-lang:master Apr 8, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 8, 2021
@lukaslueg lukaslueg deleted the stab_peek_mut branch April 9, 2021 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KodrAus KodrAus KodrAus left review comments

@JohnTitor JohnTitor JohnTitor left review comments

@pthariensflame pthariensflame pthariensflame requested changes

Assignees

@Amanieu Amanieu

Labels
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. 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
Milestone
1.53.0
Development

Successfully merging this pull request may close these issues.

Tracking issue for std::iter::Peekable::peek_mut