user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some hir pretty-printing over-indenting.

Browse source
This commit is contained in:
Nicholas Nethercote 2025-04-30 16:05:47 +10:00
parent e1a177bbba
commit 809e5b5ed1
2 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_hir_pretty/src/lib.rs
View file

@ -1503,7 +1503,7 @@ impl<'a> State<'a> {
}
hir::ExprKind::DropTemps(init) => {
// Print `{`:
let cb = self.cbox(INDENT_UNIT);
let cb = self.cbox(0);
let ib = self.ibox(0);
self.bopen(ib);
@ -1530,12 +1530,14 @@ impl<'a> State<'a> {
self.print_ident(label.ident);
self.word_space(":");
}
let (cb, ib) = self.head("loop");
let cb = self.cbox(0);
let ib = self.ibox(0);
self.word_nbsp("loop");
self.print_block(blk, cb, ib);
}
hir::ExprKind::Match(expr, arms, _) => {
let cb = self.cbox(INDENT_UNIT);
let ib = self.ibox(INDENT_UNIT);
let cb = self.cbox(0);
let ib = self.ibox(0);
self.word_nbsp("match");
self.print_expr_as_cond(expr);
self.space();

61
tests/ui/unpretty/exhaustive.hir.stdout
View file

@ -173,32 +173,32 @@ mod expressions {
fn expr_for_loop() {
let x;
{
let _t =
match #[lang = "into_iter"](x) {
mut iter =>
loop {
match #[lang = "next"](&mut iter) {
#[lang = "None"] {} => break,
#[lang = "Some"] { 0: _ } => { }
}
},
};
_t
};
let _t =
match #[lang = "into_iter"](x) {
mut iter =>
loop {
match #[lang = "next"](&mut iter) {
#[lang = "None"] {} => break,
#[lang = "Some"] { 0: _ } => { }
}
},
};
_t
};
{
let _t =
match #[lang = "into_iter"](x) {
mut iter =>
'a:
loop {
match #[lang = "next"](&mut iter) {
#[lang = "None"] {} => break,
#[lang = "Some"] { 0: _ } => { }
}
},
};
_t
}
let _t =
match #[lang = "into_iter"](x) {
mut iter =>
'a:
loop {
match #[lang = "next"](&mut iter) {
#[lang = "None"] {} => break,
#[lang = "Some"] { 0: _ } => { }
}
},
};
_t
}
}
/// ExprKind::Loop
@ -383,12 +383,11 @@ mod expressions {
fn expr_try() {
let expr;
match #[lang = "branch"](expr) {
#[lang = "Break"] { 0: residual } =>
#[allow(unreachable_code)]
return #[lang = "from_residual"](residual),
#[lang = "Continue"] { 0: val } => #[allow(unreachable_code)]
val,
};
#[lang = "Break"] { 0: residual } => #[allow(unreachable_code)]
return #[lang = "from_residual"](residual),
#[lang = "Continue"] { 0: val } => #[allow(unreachable_code)]
val,
};
}
/// ExprKind::Yield
fn expr_yield() { yield (); yield true; }