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 bool::then_some #96628

Merged
merged 1 commit into from
May 5, 2022
Merged

Stabilize bool::then_some #96628

merged 1 commit into from
May 5, 2022

Conversation

joshtriplett
Copy link
Member

FCP completed in #80967

@rust-highfive
Copy link
Collaborator

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with r? rust-lang/libs-api @rustbot label +T-libs-api -T-libs to request review from a libs-api team reviewer. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 2, 2022
@rust-highfive
Copy link
Collaborator

r? @cjgillot

(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 May 2, 2022
@joshtriplett joshtriplett added T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. and removed T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 2, 2022
@joshtriplett
Copy link
Member Author

r? @rust-lang/libs-api

@rust-highfive rust-highfive assigned dtolnay and unassigned cjgillot May 2, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@joshtriplett joshtriplett force-pushed the stabilize-then-some branch from 3e7d329 to 288fa86 Compare May 2, 2022 07:27
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@joshtriplett joshtriplett force-pushed the stabilize-then-some branch from 288fa86 to 10d2f11 Compare May 2, 2022 08:13
@joshtriplett
Copy link
Member Author

@bors r=@m-ou-se

@bors
Copy link
Contributor

bors commented May 3, 2022

📌 Commit 10d2f1159d8f4cc8ee0dc16984257988de6e3568 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 May 3, 2022
@bors
Copy link
Contributor

bors commented May 3, 2022

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

@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 May 3, 2022
@m-ou-se m-ou-se force-pushed the stabilize-then-some branch from 10d2f11 to 0fc5c52 Compare May 4, 2022 11:23
@m-ou-se
Copy link
Member

m-ou-se commented May 4, 2022

Rebased.

@bors r+

@bors
Copy link
Contributor

bors commented May 4, 2022

📌 Commit 0fc5c52 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 4, 2022
@JohnTitor JohnTitor mentioned this pull request May 5, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2022
@bors
Auto merge of rust-lang#96720 - JohnTitor:rollup-9jaaekr, r=JohnTitor
7d3e036 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#96603 (Enable full revision in const generics ui tests)
 - rust-lang#96616 (Relax memory ordering used in `min_stack`)
 - rust-lang#96619 (Relax memory ordering used in SameMutexCheck)
 - rust-lang#96628 (Stabilize `bool::then_some`)
 - rust-lang#96658 (Move callback to the () => {} syntax.)
 - rust-lang#96677 (Add more tests for label-break-value)
 - rust-lang#96697 (Enable tracing for all queries)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit da57b3a into rust-lang:master May 5, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 5, 2022
@joshtriplett joshtriplett deleted the stabilize-then-some branch May 5, 2022 07:09
@Xiretza Xiretza mentioned this pull request May 14, 2022
Closed
3 tasks
@JohnTitor JohnTitor added the relnotes Marks issues that should be documented in the release notes of the next release. label Jun 21, 2022
@har7an har7an mentioned this pull request Aug 3, 2022
Closed
har7an added a commit to har7an/esp-hal that referenced this pull request Aug 3, 2022
@har7an
procmacros: Replace then_some
75218cf 
which was just [recently stabilized in rust 1.62.0][1] and hence raises
the MSRV to 1.62.0 for all HALs. Use `bool::then` instead, which takes a
closure instead of a parameter but has the same effect otherwise and is
available [since rust 1.50.0][2].

[1]: rust-lang/rust#96628
[2]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then
@har7an har7an mentioned this pull request Aug 3, 2022
Merged
jessebraham pushed a commit to esp-rs/esp-hal that referenced this pull request Aug 3, 2022
@har7an @jessebraham
procmacros: Replace then_some
525c605 
which was just [recently stabilized in rust 1.62.0][1] and hence raises
the MSRV to 1.62.0 for all HALs. Use `bool::then` instead, which takes a
closure instead of a parameter but has the same effect otherwise and is
available [since rust 1.50.0][2].

[1]: rust-lang/rust#96628
[2]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then
har7an added a commit to har7an/esp-hal that referenced this pull request Aug 8, 2022
@har7an
procmacros: Replace then_some
99e9e73 
which was just [recently stabilized in rust 1.62.0][1] and hence raises
the MSRV to 1.62.0 for all HALs. Use `bool::then` instead, which takes a
closure instead of a parameter but has the same effect otherwise and is
available [since rust 1.50.0][2].

[1]: rust-lang/rust#96628
[2]: https://doc.rust-lang.org/stable/std/primitive.bool.html#method.then
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@m-ou-se m-ou-se m-ou-se left review comments

Assignees

@dtolnay dtolnay

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
Milestone
1.62.0
Development

Successfully merging this pull request may close these issues.
9 participants
@joshtriplett @rust-highfive @rust-log-analyzer @bors @m-ou-se @cjgillot @dtolnay @JohnTitor @rustbot