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 Option::flatten #64747

Merged
merged 1 commit into from
Oct 28, 2019
Merged

Stabilize Option::flatten #64747

merged 1 commit into from
Oct 28, 2019

Conversation

eopb
Copy link
Contributor

@eopb eopb commented Sep 24, 2019 •
edited by dtolnay
Loading

@elahn

I was trying to flat_map() and found map().flatten() does the trick. This has been on nightly for 4 months, can we stabilise it?

@ethanboxx

@Centril Helped me get this merged. What is the stabilization process?

@Centril

@ethanboxx I'd just file a PR to stabilize it and we'll ask T-libs to FCP.

So here I am.

I am was unsure what number to put in since = "-" so I copied what someone had done in a recent PR.

@rust-highfive
Copy link
Collaborator

r? @kennytm

(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 Sep 24, 2019
@jonas-schievink jonas-schievink added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 24, 2019
@jonas-schievink jonas-schievink added this to the 1.40 milestone Sep 24, 2019
@jonas-schievink jonas-schievink added needs-fcp This change is insta-stable, so needs a completed FCP to proceed. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Sep 24, 2019
@Centril
Copy link
Contributor

Centril commented Sep 24, 2019

PR looks good; excited about this!

cc @alexcrichton

@Centril Centril assigned alexcrichton and unassigned kennytm Sep 24, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@hellow554 hellow554 mentioned this pull request Sep 25, 2019
Closed
@hellow554

This comment has been minimized.

Sign in to view
@alexcrichton
Copy link
Member

@rfcbot fcp merge

@rfcbot
Copy link

rfcbot commented Sep 25, 2019 •
edited by Amanieu
Loading

Team member @alexcrichton 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 Sep 25, 2019
@Centril Centril removed the needs-fcp This change is insta-stable, so needs a completed FCP to proceed. label Sep 26, 2019
@Centril
Copy link
Contributor

Centril commented Oct 11, 2019

👋 @sfackler @withoutboats @Kimundi @Amanieu

@rfcbot
Copy link

rfcbot commented Oct 17, 2019

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

@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 Oct 17, 2019
@bors
Copy link
Contributor

bors commented Oct 19, 2019

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

@Centril
Copy link
Contributor

Centril commented Oct 19, 2019

@ethanboxx Can you please squash the commits into one? (We do not allow merge commits in the history.)

@Centril Centril added S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 24, 2019
@Centril
Copy link
Contributor

Centril commented Oct 24, 2019

r? @Centril r=me rollup when FCP has completed.

@rfcbot
Copy link

rfcbot commented Oct 27, 2019

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.

@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 Oct 27, 2019
@Centril
Copy link
Contributor

Centril commented Oct 27, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 27, 2019

📌 Commit 65af429 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 27, 2019
@Centril
Rollup merge of rust-lang#64747 - ethanboxx:master, r=Centril
ad680c3 
Stabilize `Option::flatten`

- PR: rust-lang#60256
- Tracking issue: rust-lang#60258

@elahn

> I was trying to `flat_map()` and found `map().flatten()` does the trick. This has been on nightly for 4 months, can we stabilise it?

@ethanboxx

> @Centril Helped me get this merged. What is the stabilization process?

@Centril

> @ethanboxx I'd just file a PR to stabilize it and we'll ask T-libs to FCP.

So here I am.

I am was unsure what number to put in `since = "-"` so I copied what someone had done in a recent PR.
@Centril Centril mentioned this pull request Oct 27, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 28, 2019
@Centril
Rollup merge of rust-lang#64747 - ethanboxx:master, r=Centril
c8eefdf 
Stabilize `Option::flatten`

- PR: rust-lang#60256
- Tracking issue: rust-lang#60258

@elahn

> I was trying to `flat_map()` and found `map().flatten()` does the trick. This has been on nightly for 4 months, can we stabilise it?

@ethanboxx

> @Centril Helped me get this merged. What is the stabilization process?

@Centril

> @ethanboxx I'd just file a PR to stabilize it and we'll ask T-libs to FCP.

So here I am.

I am was unsure what number to put in `since = "-"` so I copied what someone had done in a recent PR.
@Centril Centril mentioned this pull request Oct 28, 2019
Merged
bors added a commit that referenced this pull request Oct 28, 2019
@bors
Auto merge of #65885 - Centril:rollup-y6b2qbf, r=Centril
9285d40 
Rollup of 6 pull requests

Successful merges:

 - #64747 (Stabilize `Option::flatten`)
 - #65664 (`std::panic::Location` is a lang_item, add `core::intrinsics::caller_location` (RFC 2091 3/N))
 - #65792 (rustc, rustc_passes: reduce deps on rustc_expand)
 - #65849 (librustc_lexer: Enhance documentation)
 - #65873 (doc: explain why it is unsafe to construct Vec<u8> from Vec<u16>)
 - #65880 (Gather together usefulness tests)

Failed merges:

r? @ghost
@bors bors merged commit 65af429 into rust-lang:master Oct 28, 2019
@lonng lonng mentioned this pull request Nov 18, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gilescope gilescope gilescope approved these changes

Assignees

@Centril Centril

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. S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.40
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@eopb @rust-highfive @Centril @hellow554 @alexcrichton @rfcbot @bors @gilescope @kennytm @jonas-schievink