if $c:expr { Some($r:expr) } else { None } =>> $c.then(|| $r)

2023-02-15 11:43:41 +00:00 · 2023-02-15 11:43:41 +00:00 · 8751fa1a9a
commit 8751fa1a9a
parent af3c8b2726
54 changed files with 159 additions and 281 deletions
--- a/compiler/rustc_codegen_cranelift/src/driver/aot.rs
+++ b/compiler/rustc_codegen_cranelift/src/driver/aot.rs
@ -248,17 +248,13 @@ fn reuse_workproduct_for_cgu(
            dwarf_object: None,
            bytecode: None,
        },
-        module_global_asm: if has_global_asm {
-            Some(CompiledModule {
-                name: cgu.name().to_string(),
-                kind: ModuleKind::Regular,
-                object: Some(obj_out_global_asm),
-                dwarf_object: None,
-                bytecode: None,
-            })
-        } else {
-            None
-        },
+        module_global_asm: has_global_asm.then(|| CompiledModule {
+            name: cgu.name().to_string(),
+            kind: ModuleKind::Regular,
+            object: Some(obj_out_global_asm),
+            dwarf_object: None,
+            bytecode: None,
+        }),
        existing_work_product: Some((cgu.work_product_id(), work_product)),
    })
 }