nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-09 16:37:36 +00:00
Code Issues 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
Show Stats 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 { match &_else.kind {
// Another `else if` block. // Another `else if` block.
ast::ExprKind::If(i, then, e) => { ast::ExprKind::If(i, then, e) => {
self.cbox(INDENT_UNIT); self.cbox(0);
self.ibox(0); self.ibox(0);
self.word(" else if "); self.word(" else if ");
self.print_expr_as_cond(i); self.print_expr_as_cond(i);
@ -31,7 +31,7 @@ impl<'a> State<'a> {
} }
// Final `else` block. // Final `else` block.
ast::ExprKind::Block(b, _) => { ast::ExprKind::Block(b, _) => {
self.cbox(INDENT_UNIT); self.cbox(0);
self.ibox(0); self.ibox(0);
self.word(" else "); self.word(" else ");
self.print_block(b) 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>) { 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.print_expr_as_cond(test);
self.space(); self.space();
self.print_block(blk); 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 { match els_inner.kind {
// Another `else if` block. // Another `else if` block.
hir::ExprKind::If(i, then, e) => { hir::ExprKind::If(i, then, e) => {
self.cbox(INDENT_UNIT); self.cbox(0);
self.ibox(0); self.ibox(0);
self.word(" else if "); self.word(" else if ");
self.print_expr_as_cond(i); self.print_expr_as_cond(i);
@ -1075,7 +1075,7 @@ impl<'a> State<'a> {
} }
// Final `else` block. // Final `else` block.
hir::ExprKind::Block(b, _) => { hir::ExprKind::Block(b, _) => {
self.cbox(INDENT_UNIT); self.cbox(0);
self.ibox(0); self.ibox(0);
self.word(" else "); self.word(" else ");
self.print_block(b); self.print_block(b);
@ -1094,7 +1094,9 @@ impl<'a> State<'a> {
blk: &hir::Expr<'_>, blk: &hir::Expr<'_>,
elseopt: Option<&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.print_expr_as_cond(test);
self.space(); self.space();
self.print_expr(blk); self.print_expr(blk);

62
tests/pretty/hir-if-else.pp
View File

@ -12,37 +12,37 @@ fn f(x: u32,
let mut a = 0; let mut a = 0;
if x > y { a = 1; } else { a = 2; } if x > y { a = 1; } else { a = 2; }
if x < 1 if x < 1
{
a = 1;
} else if x < 2
{
a = 2;
} else if x < 3
{
a = 3;
} else if x < 4 { a = 4; } else { a = 5; }
if x < y
{
a += 1;
a += 1;
a += 1;
a += 1;
a += 1;
a += 1;
} else { a += 1; a += 1; a += 1; a += 1; a += 1; a += 1; }
if x < 1
{ {
a = 1; if x < 2
} else if x < 2
{
a = 2;
} else if x < 3
{ {
a = 3; if x < 3
} else if x < 4 { a = 4; } else { a = 5; } {
a += 1;
} else if x < 4
{ a += 1; if x < 5 { a += 1; } }
} else if x < 6 { a += 1; } }
}
if x < y fn main() { f(3, 4); }
{
a += 1;
a += 1;
a += 1;
a += 1;
a += 1;
a += 1;
} else { a += 1; a += 1; a += 1; a += 1; a += 1; a += 1; }
if x < 1
{
if x < 2
{
if x < 3
{
a += 1;
} else if x < 4
{ a += 1; if x < 5 { a += 1; } }
} else if x < 6 { a += 1; } }
}
fn main() { f(3, 4); }

60
tests/pretty/if-else.pp
View File

@ -13,40 +13,40 @@ fn f(x: u32, y: u32) {
if x > y { a = 1; } else { a = 2; } if x > y { a = 1; } else { a = 2; }
if x < 1 { if x < 1 {
a = 1; a = 1;
} else if x < 2 { } else if x < 2 {
a = 2; a = 2;
} else if x < 3 { a = 3; } else if x < 4 { a = 4; } else { a = 5; } } else if x < 3 { a = 3; } else if x < 4 { a = 4; } else { a = 5; }
if x < y { if x < y {
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
} else { } else {
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
a += 1; a += 1;
} }
if x < 1 { if x < 1 {
if x < 2 { if x < 2 {
if x < 3 { if x < 3 {
a += 1; a += 1;
} else if x < 4 { a += 1; if x < 5 { a += 1; } } } else if x < 4 { a += 1; if x < 5 { a += 1; } }
} else if x < 6 { a += 1; } } else if x < 6 { a += 1; }
} }
} }
fn main() { f(3, 4); } fn main() { f(3, 4); }

94
tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
View File

@ -18,18 +18,18 @@ fn arbitrary_consuming_method_for_demonstration_purposes() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*{ if ::core::intrinsics::unlikely(!(*{
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
__local_bind0 __local_bind0
} as usize)) { } as usize)) {
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem as usize\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem as usize\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
} }
fn addr_of() { fn addr_of() {
@ -40,12 +40,12 @@ fn addr_of() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!&*__local_bind0) { if ::core::intrinsics::unlikely(!&*__local_bind0) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: &elem\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: &elem\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
} }
fn binary() { fn binary() {
@ -56,12 +56,12 @@ fn binary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*__local_bind0 == 1)) { if ::core::intrinsics::unlikely(!(*__local_bind0 == 1)) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem == 1\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem == 1\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
{ {
#[allow(unused_imports)] #[allow(unused_imports)]
@ -69,12 +69,12 @@ fn binary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*__local_bind0 >= 1)) { if ::core::intrinsics::unlikely(!(*__local_bind0 >= 1)) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem >= 1\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem >= 1\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
{ {
#[allow(unused_imports)] #[allow(unused_imports)]
@ -82,12 +82,12 @@ fn binary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*__local_bind0 > 0)) { if ::core::intrinsics::unlikely(!(*__local_bind0 > 0)) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem > 0\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem > 0\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
{ {
#[allow(unused_imports)] #[allow(unused_imports)]
@ -95,12 +95,12 @@ fn binary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*__local_bind0 < 3)) { if ::core::intrinsics::unlikely(!(*__local_bind0 < 3)) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem < 3\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem < 3\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
{ {
#[allow(unused_imports)] #[allow(unused_imports)]
@ -108,12 +108,12 @@ fn binary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*__local_bind0 <= 3)) { if ::core::intrinsics::unlikely(!(*__local_bind0 <= 3)) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem <= 3\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem <= 3\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
{ {
#[allow(unused_imports)] #[allow(unused_imports)]
@ -121,12 +121,12 @@ fn binary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!(*__local_bind0 != 3)) { if ::core::intrinsics::unlikely(!(*__local_bind0 != 3)) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: elem != 3\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: elem != 3\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
} }
fn unary() { fn unary() {
@ -137,12 +137,12 @@ fn unary() {
let mut __capture0 = ::core::asserting::Capture::new(); let mut __capture0 = ::core::asserting::Capture::new();
let __local_bind0 = &elem; let __local_bind0 = &elem;
if ::core::intrinsics::unlikely(!**__local_bind0) { if ::core::intrinsics::unlikely(!**__local_bind0) {
(&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0); (&::core::asserting::Wrapper(__local_bind0)).try_capture(&mut __capture0);
{ {
::std::rt::panic_fmt(format_args!("Assertion failed: *elem\nWith captures:\n elem = {0:?}\n", ::std::rt::panic_fmt(format_args!("Assertion failed: *elem\nWith captures:\n elem = {0:?}\n",
__capture0)); __capture0));
}
} }
}
}; };
} }
fn main() {} fn main() {}

12
tests/ui/match/issue-82392.stdout
View File

@ -9,9 +9,9 @@ extern crate std;
fn main() ({ fn main() ({
(if (true as bool) (if (true as bool)
({ } as ({ } as
()) else if (let Some(a) = ()) else if (let Some(a) =
((Some as ((Some as
fn(i32) -> Option<i32> {Option::<i32>::Some})((3 as i32)) as fn(i32) -> Option<i32> {Option::<i32>::Some})((3 as i32)) as
Option<i32>) as bool) ({ } as ()) as ()) Option<i32>) as bool) ({ } as ()) as ())
} as ()) } as ())

24
tests/ui/proc-macro/quote/debug.stdout
View File

@ -32,12 +32,12 @@ fn main() {
let mut iter = let mut iter =
"\"world\"".parse::<crate::TokenStream>().unwrap().into_iter(); "\"world\"".parse::<crate::TokenStream>().unwrap().into_iter();
if let (Some(crate::TokenTree::Literal(mut lit)), None) = if let (Some(crate::TokenTree::Literal(mut lit)), None) =
(iter.next(), iter.next()) { (iter.next(), iter.next()) {
lit.set_span(crate::Span::recover_proc_macro_span(2)); lit.set_span(crate::Span::recover_proc_macro_span(2));
lit lit
} else { } else {
::core::panicking::panic("internal error: entered unreachable code") ::core::panicking::panic("internal error: entered unreachable code")
} }
}), &mut ts); }), &mut ts);
crate::ToTokens::to_tokens(&crate::TokenTree::Punct(crate::Punct::new(';', crate::ToTokens::to_tokens(&crate::TokenTree::Punct(crate::Punct::new(';',
crate::Spacing::Alone)), &mut ts); crate::Spacing::Alone)), &mut ts);
@ -51,12 +51,12 @@ fn main() {
let mut iter = let mut iter =
"r#\"raw\"literal\"#".parse::<crate::TokenStream>().unwrap().into_iter(); "r#\"raw\"literal\"#".parse::<crate::TokenStream>().unwrap().into_iter();
if let (Some(crate::TokenTree::Literal(mut lit)), None) = if let (Some(crate::TokenTree::Literal(mut lit)), None) =
(iter.next(), iter.next()) { (iter.next(), iter.next()) {
lit.set_span(crate::Span::recover_proc_macro_span(5)); lit.set_span(crate::Span::recover_proc_macro_span(5));
lit lit
} else { } else {
::core::panicking::panic("internal error: entered unreachable code") ::core::panicking::panic("internal error: entered unreachable code")
} }
}), &mut ts); }), &mut ts);
crate::ToTokens::to_tokens(&crate::TokenTree::Punct(crate::Punct::new(';', crate::ToTokens::to_tokens(&crate::TokenTree::Punct(crate::Punct::new(';',
crate::Spacing::Alone)), &mut ts); crate::Spacing::Alone)), &mut ts);