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

Use Option::is_some_and and Result::is_ok_and in the compiler #111912

Merged
merged 2 commits into from May 25, 2023
Merged

Use Option::is_some_and and Result::is_ok_and in the compiler #111912

merged 2 commits into from May 25, 2023
+201 −246

Conversation

WaffleLapkin
Copy link
Member

.is_some_and(..)/.is_ok_and(..) replace .map_or(false, ..) and .map(..).unwrap_or(false), making the code more readable.

This PR is a sibling of #111873 (comment)

@rustbot
Copy link
Collaborator

rustbot commented May 24, 2023

r? @petrochenkov

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

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels May 24, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 24, 2023

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@WaffleLapkin WaffleLapkin removed A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels May 24, 2023
@petrochenkov
Copy link
Contributor

Another use case for EXPR is PAT pattern matching expressions (rust-lang/rfcs#2497 (comment)).
x.is_some_and(|y| y > 0) -> x is Some(y) && y > 0.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 24, 2023

📌 Commit 307799a has been approved by petrochenkov

It is now in the queue for this repository.

@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 24, 2023
@Manishearth Manishearth mentioned this pull request May 24, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2023
@bors
Auto merge of rust-lang#111925 - Manishearth:rollup-z6z6l2v, r=Manish…
7664dfe 
…earth

Rollup of 5 pull requests

Successful merges:

 - rust-lang#111741 (Use `ObligationCtxt` in custom type ops)
 - rust-lang#111840 (Expose more information in `get_body_with_borrowck_facts`)
 - rust-lang#111876 (Roll compiler_builtins to 0.1.92)
 - rust-lang#111912 (Use `Option::is_some_and` and `Result::is_ok_and` in the compiler  )
 - rust-lang#111915 (libtest: Improve error when missing `-Zunstable-options`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d0b3ebe into rust-lang:master May 25, 2023
11 checks passed
@rustbot rustbot added this to the 1.71.0 milestone May 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@WaffleLapkin @rustbot @petrochenkov @bors