Skip to content

Stabilise then - #79299

Merged
bors merged 1 commit into
rust-lang:masterfrom
varkor:stabilise-then
Nov 23, 2020
Merged

Stabilise then#79299
bors merged 1 commit into
rust-lang:masterfrom
varkor:stabilise-then

Conversation

@varkor

@varkorvarkor commented Nov 22, 2020

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor

r? @kennytm

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 22, 2020
@jyn514jyn514 added the T-libs-api [DEPRECATED; DO NOT USE] label Nov 22, 2020
@jyn514

This comment has been minimized.

@varkor

This comment has been minimized.

@m-ou-se

Copy link
Copy Markdown
Member

Thanks!

@bors r+

@bors

bors commented Nov 22, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors 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`.
@m-ou-sem-ou-se mentioned this pull request Nov 22, 2020
@m-ou-sem-ou-se mentioned this pull request Nov 22, 2020
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:masterNov 23, 2020
@rustbotrustbot added this to the 1.50.0 milestone Nov 23, 2020
@pthariensflame

Copy link
Copy Markdown
Contributor

This seems like it should be relnotes?

@jyn514jyn514 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.
@edward-shenedward-shen mentioned this pull request Oct 18, 2021
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotesMarks issues that should be documented in the release notes of the next release.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libs-api[DEPRECATED; DO NOT USE]

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@varkor@rust-highfive@jyn514@m-ou-se@bors@pthariensflame@kennytm@rustbot