Merge pull request #56 from dtolnay/letelse

Improve let-else formatting
dtolnay · Jul 20, 2023 · 0142ff4 · 0142ff4
2 parents 7120cbe + ba428ec
commit 0142ff4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/stmt.rs b/src/stmt.rs
@@ -15,9 +15,14 @@ impl Printer {
                     self.neverbreak();
                     self.expr(&local_init.expr);
                     if let Some((_else, diverge)) = &local_init.diverge {
-                        self.word(" else ");
+                        self.space();
+                        self.word("else ");
+                        self.end();
+                        self.neverbreak();
                         if let Expr::Block(expr) = diverge.as_ref() {
+                            self.cbox(INDENT);
                             self.small_block(&expr.block, &[]);
+                            self.end();
                         } else {
                             self.word("{");
                             self.space();
@@ -28,10 +33,13 @@ impl Printer {
                             self.offset(-INDENT);
                             self.word("}");
                         }
+                    } else {
+                        self.end();
                     }
+                } else {
+                    self.end();
                 }
                 self.word(";");
-                self.end();
                 self.hardbreak();
             }
             Stmt::Item(item) => self.item(item),