rustfmt now supports let else

Author: Nadrieril

charon/src/export.rs

@@ -91,7 +91,7 @@ impl<FD: Serialize + Clone, GD: Serialize + Clone> GCrateData<FD, GD> {
         // Create the file.
         let std::io::Result::Ok(outfile) = File::create(target_filename.clone()) else {
             error!("Could not open: {:?}", target_filename);
-            return Err(())
+            return Err(());
         };
         // Write to the file.
         let std::result::Result::Ok(()) = serde_json::to_writer(&outfile, self) else {

charon/src/transform/remove_dynamic_checks.rs

@@ -16,7 +16,10 @@ fn remove_dynamic_checks(ctx: &mut TransformCtx, block: &mut BlockData) {
         cond: Operand::Move(cond),
         expected,
         target,
-    } = &block.terminator.content else { return };
+    } = &block.terminator.content
+    else {
+        return;
+    };
 
     // We return the statements we want to keep, which must be a prefix of `block.statements`.
     let statements_to_keep = match block.statements.as_mut_slice() {

charon/src/transform/remove_read_discriminant.rs

@@ -66,7 +66,7 @@ impl<'a, 'ctx> Visitor<'a, 'ctx> {
                         content: RawStatement::Nop,
                         meta: st.meta,
                     };
-                    return
+                    return;
                 };
 
                 // We look for a `SwitchInt` just after the discriminant read.
@@ -87,8 +87,11 @@ impl<'a, 'ctx> Visitor<'a, 'ctx> {
 
                 match maybe_switch {
                     Ok((meta2, switch, st3_opt)) => {
-                        let Switch::SwitchInt(Operand::Move(op_p), _int_ty, targets, otherwise) = switch
-                        else { unreachable!() };
+                        let Switch::SwitchInt(Operand::Move(op_p), _int_ty, targets, otherwise) =
+                            switch
+                        else {
+                            unreachable!()
+                        };
                         assert!(op_p.projection.is_empty() && op_p.var_id == dest.var_id);
 
                         // Convert between discriminants and variant indices. Remark: the discriminant can

charon/src/translate/translate_constants.rs

@@ -157,7 +157,9 @@ impl<'tcx, 'ctx, 'ctx1> BodyTransCtx<'tcx, 'ctx, 'ctx1> {
                     trait_refs,
                     trait_info,
                 )?;
-                let SubstFunIdOrPanic::Fun(fn_id) = fn_id else  { unreachable!() };
+                let SubstFunIdOrPanic::Fun(fn_id) = fn_id else {
+                    unreachable!()
+                };
                 RawConstantExpr::FnPtr(fn_id.func)
             }
             ConstantExprKind::Todo(msg) => {

charon/tests/ui.rs

@@ -68,7 +68,9 @@ fn parse_magic_comments(input_path: &std::path::Path) -> anyhow::Result<MagicCom
         auxiliary_crates: Vec::new(),
     };
     for line in read_to_string(input_path)?.lines() {
-        let Some(line) = line.strip_prefix("//@") else { break };
+        let Some(line) = line.strip_prefix("//@") else {
+            break;
+        };
         let line = line.trim();
         if line == "known-panic" {
             comments.test_kind = TestKind::KnownPanic;