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

Replace option.map(cond) == Some(true) with option.is_some_and(cond) #118253

Merged
merged 1 commit into from
Nov 25, 2023

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Nov 24, 2023

Requested by @fmease in #118226 (review).

There is also a much larger number of option.map_or(false, cond) that can be changed separately if someone wants.

r? fmease

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler 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 Nov 24, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 24, 2023

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/rust-analyzer

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@lnicola
Copy link
Member

lnicola commented Nov 24, 2023

If these aren't strictly required to build rustc, we prefer merging any changes upstream (in rust-analyzer) first.

bors added a commit to rust-lang/rust-analyzer that referenced this pull request Nov 24, 2023
Replace `option.map(cond) == Some(true)` with `option.is_some_and(cond)`

Extracted from rust-lang/rust#118253.
@dtolnay
Copy link
Member Author

dtolnay commented Nov 24, 2023

Sounds good. I have moved the src/tools/rust-analyzer change to rust-lang/rust-analyzer#15960.

I have also created #118255 to make rustbot inform PR authors about this preference.

@fmease
Copy link
Member

fmease commented Nov 24, 2023

My purview is rustdoc only.
r? compiler

@rustbot rustbot assigned davidtwco and unassigned fmease Nov 24, 2023
@compiler-errors
Copy link
Member

r? compiler-errors @bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 24, 2023

📌 Commit 8cc7073 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned davidtwco Nov 24, 2023
@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 24, 2023
fmease added a commit to fmease/rust that referenced this pull request Nov 25, 2023
…rk-Simulacrum

Request that rust-analyzer changes are sent upstream first if possible

This automates `@lnicola's` comment rust-lang#118253 (comment).

Rustbot will write a comment similar to rust-lang#116743 (comment).
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2023
Rollup of 9 pull requests

Successful merges:

 - rust-lang#118220 (general improvements/fixes on bootstrap)
 - rust-lang#118251 (rustdoc-search: avoid infinite where clause unbox)
 - rust-lang#118253 (Replace `option.map(cond) == Some(true)` with `option.is_some_and(cond)`)
 - rust-lang#118255 (Request that rust-analyzer changes are sent upstream first if possible)
 - rust-lang#118259 (Move EagerResolution to rustc_infer::infer::resolve)
 - rust-lang#118262 (Relate Inherent Associated Types using eq)
 - rust-lang#118266 (Move stuff around on `stable_mir` and `rustc_smir` crate)
 - rust-lang#118271 (Separate `NaN`/`Inf` floats with `_`)
 - rust-lang#118274 (Fix smir's `Ty::Ref` pretty printing)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8e606a6 into rust-lang:master Nov 25, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 25, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2023
Rollup merge of rust-lang#118255 - dtolnay:mentionsrustanalyzer, r=Mark-Simulacrum

Request that rust-analyzer changes are sent upstream first if possible

This automates `@lnicola's` comment rust-lang#118253 (comment).

Rustbot will write a comment similar to rust-lang#116743 (comment).
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2023
Rollup merge of rust-lang#118253 - dtolnay:issomeand, r=compiler-errors

Replace `option.map(cond) == Some(true)` with `option.is_some_and(cond)`

Requested by `@fmease` in rust-lang#118226 (review).

There is also a much larger number of `option.map_or(false, cond)` that can be changed separately if someone wants.

r? fmease
@dtolnay dtolnay deleted the issomeand branch November 25, 2023 15:23
Copy link
Member Author

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also a much larger number of option.map_or(false, cond) that can be changed separately if someone wants.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants