]> git.lizzy.rs Git - rust.git/commit
Rollup merge of #92412 - dtolnay:tryspace, r=Mark-Simulacrum
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 1 Jan 2022 09:48:55 +0000 (10:48 +0100)
committerGitHub <noreply@github.com>
Sat, 1 Jan 2022 09:48:55 +0000 (10:48 +0100)
commit682b4cbc4ee64fd3c4c548061e126496774f1435
treec36b1ba33d2b5c1c8d6f3f83700de7b80f6fcbaf
parenta6e4d684aa37c0c2e63cb5abf7b0fcf8b404d69c
parent2f25a4ab304dbbb17f8cae06025d4e98e8e7198a
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:&ensp;<code>try&nbsp;&nbsp;{}</code>
After:&ensp;<code>try&nbsp;{}</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
compiler/rustc_ast_pretty/src/pprust/state.rs
src/test/ui/macros/stringify.rs