is_{some,ok}_and

2023-11-25 17:12:15 +00:00
parent fe3038f263
commit 079a2e865f
8 changed files with 21 additions and 13 deletions
--- a/compiler/rustc_mir_dataflow/src/value_analysis.rs
+++ b/compiler/rustc_mir_dataflow/src/value_analysis.rs
@@ -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;
        }