rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve pretty printing of if/else.

Browse Source 
By removing some of the over-indenting. AST pretty printing now looks
correct. HIR pretty printing is better, but still over-indents some.
This commit is contained in:
Nicholas Nethercote
2025-04-25 13:51:49 +10:00
parent ee43aa356a
commit e37c367482
7 changed files with 136 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_ast_pretty/src/pprust/state/expr.rs
View File

@@ -21,7 +21,7 @@ impl<'a> State<'a> {
match &_else.kind {
// Another `else if` block.
ast::ExprKind::If(i, then, e) => {
self.cbox(INDENT_UNIT);
self.cbox(0);
self.ibox(0);
self.word(" else if ");
self.print_expr_as_cond(i);
@@ -31,7 +31,7 @@ impl<'a> State<'a> {
}
// Final `else` block.
ast::ExprKind::Block(b, _) => {
self.cbox(INDENT_UNIT);
self.cbox(0);
self.ibox(0);
self.word(" else ");
self.print_block(b)
@@ -45,7 +45,9 @@ impl<'a> State<'a> {
}
fn print_if(&mut self, test: &ast::Expr, blk: &ast::Block, elseopt: Option<&ast::Expr>) {
self.head("if");
self.cbox(0);
self.ibox(0);
self.word_nbsp("if");
self.print_expr_as_cond(test);
self.space();
self.print_block(blk);

8
compiler/rustc_hir_pretty/src/lib.rs
View File

@@ -1065,7 +1065,7 @@ impl<'a> State<'a> {
match els_inner.kind {
// Another `else if` block.
hir::ExprKind::If(i, then, e) => {
self.cbox(INDENT_UNIT);
self.cbox(0);
self.ibox(0);
self.word(" else if ");
self.print_expr_as_cond(i);
@@ -1075,7 +1075,7 @@ impl<'a> State<'a> {
}
// Final `else` block.
hir::ExprKind::Block(b, _) => {
self.cbox(INDENT_UNIT);
self.cbox(0);
self.ibox(0);
self.word(" else ");
self.print_block(b);
@@ -1094,7 +1094,9 @@ impl<'a> State<'a> {
blk: &hir::Expr<'_>,
elseopt: Option<&hir::Expr<'_>>,
) {
self.head("if");
self.cbox(0);
self.ibox(0);
self.word_nbsp("if");
self.print_expr_as_cond(test);
self.space();
self.print_expr(blk);