diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-01-01 10:48:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-01 10:48:55 +0100 |
| commit | 682b4cbc4ee64fd3c4c548061e126496774f1435 (patch) | |
| tree | c36b1ba33d2b5c1c8d6f3f83700de7b80f6fcbaf | |
| parent | a6e4d684aa37c0c2e63cb5abf7b0fcf8b404d69c (diff) | |
| parent | 2f25a4ab304dbbb17f8cae06025d4e98e8e7198a (diff) | |
Rollup merge of #92412 - dtolnay:tryspace, r=Mark-Simulacrum
Fix double space in pretty printed TryBlock
Follow-up to #92238 fixing one of the FIXMEs.
```rust
macro_rules! repro {
($expr:expr) => {
stringify!($expr)
};
}
fn main() {
println!("{}", repro!(try {}));
}
```
Before: <code>try {}</code>
After: <code>try {}</code>
The `head` helper already appends a space:
https://github.com/rust-lang/rust/blob/2b67c30bfece00357d5fc09d99b49f21066f04ba/compiler/rustc_ast_pretty/src/pprust/state.rs#L654-L664
so doing `head` followed by `space` resulted in a double space:
https://github.com/rust-lang/rust/blob/2b67c30bfece00357d5fc09d99b49f21066f04ba/compiler/rustc_ast_pretty/src/pprust/state.rs#L2241-L2242
| -rw-r--r-- | compiler/rustc_ast_pretty/src/pprust/state.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/macros/stringify.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs index 0d5ce07c6ca..d71e18fc4c1 100644 --- a/compiler/rustc_ast_pretty/src/pprust/state.rs +++ b/compiler/rustc_ast_pretty/src/pprust/state.rs @@ -2241,7 +2241,6 @@ impl<'a> State<'a> { } ast::ExprKind::TryBlock(ref blk) => { self.head("try"); - self.space(); self.print_block_with_attrs(blk, attrs) } ast::ExprKind::Err => { diff --git a/src/test/ui/macros/stringify.rs b/src/test/ui/macros/stringify.rs index 7d1c05a85bc..5eff2879624 100644 --- a/src/test/ui/macros/stringify.rs +++ b/src/test/ui/macros/stringify.rs @@ -256,7 +256,7 @@ fn test_expr() { assert_eq!(stringify_expr!(expr.await), "expr.await"); // ExprKind::TryBlock - assert_eq!(stringify_expr!(try {}), "try {}"); // FIXME + assert_eq!(stringify_expr!(try {}), "try {}"); // ExprKind::Assign assert_eq!(stringify_expr!(expr = true), "expr = true"); |
