bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #118288 - compiler-errors:is_some_and, r=lqd,dtolnay

Browse source 
Use `is_{some,ok}_and` more in the compiler

slightly more fluent-reading code
This commit is contained in:
Michael Goulet 2023-11-25 17:23:34 -05:00 • committed by GitHub
commit 8dd8db5073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_mir_dataflow/src/value_analysis.rs
View file

@ -823,7 +823,7 @@ impl Map {
) {
// Allocate a value slot if it doesn't have one, and the user requested one.
assert!(self.places[place].value_index.is_none());
if tcx.layout_of(param_env.and(ty)).map_or(false, |layout| layout.abi.is_scalar()) {
if tcx.layout_of(param_env.and(ty)).is_ok_and(|layout| layout.abi.is_scalar()) {
self.places[place].value_index = Some(self.value_count.into());
self.value_count += 1;
}