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

Stabilise then #79299

Merged
merged 1 commit into from
Nov 23, 2020
Merged

Stabilise then #79299

merged 1 commit into from
Nov 23, 2020

Conversation

varkor
Copy link
Member

@varkor varkor commented Nov 22, 2020

Stabilises the lazy variant of #64260 now that the FCP has ended.

I've kept the original feature gate bool_to_option for the strict variant (then_some), and created a new insta-stable feature gate lazy_bool_to_option for then.

@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 Nov 22, 2020
@jyn514 jyn514 added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Nov 22, 2020
@jyn514

This comment has been minimized.

@varkor

This comment has been minimized.

@m-ou-se
Copy link
Member

m-ou-se commented Nov 22, 2020

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2020

📌 Commit cf32afc has been approved by m-ou-se

@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 Nov 22, 2020
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 22, 2020
Stabilise `then`

Stabilises the lazy variant of rust-lang#64260 now that the FCP [has ended](rust-lang#64260 (comment)).

I've kept the original feature gate `bool_to_option` for the strict variant (`then_some`), and created a new insta-stable feature gate `lazy_bool_to_option` for `then`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 22, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#76941 (Add f{32,64}::is_subnormal)
 - rust-lang#77697 (Split each iterator adapter and source into individual modules)
 - rust-lang#78305 (Stabilize alloc::Layout const functions)
 - rust-lang#78608 (Stabilize refcell_take)
 - rust-lang#78793 (Clean up `StructuralEq` docs)
 - rust-lang#79267 (BTreeMap: address namespace conflicts)
 - rust-lang#79293 (Add test for eval order for a+=b)
 - rust-lang#79295 (BTreeMap: fix minor testing mistakes in rust-lang#78903)
 - rust-lang#79297 (BTreeMap: swap the names of NodeRef::new and Root::new_leaf)
 - rust-lang#79299 (Stabilise `then`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 41c033b into rust-lang:master Nov 23, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 23, 2020
@pthariensflame
Copy link
Contributor

This seems like it should be relnotes?

@jyn514 jyn514 added the relnotes Marks issues that should be documented in the release notes of the next release. label Jan 1, 2021
g2p pushed a commit to g2p/rustls-native-certs that referenced this pull request Oct 5, 2021
rustls uses bool::then, for example, stabilized in 1.50:
rust-lang/rust#79299

Note that their real MSRV is 1.52.1 so this may need to be bumped
further.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

8 participants