diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-29 10:17:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 10:17:12 +0100 |
| commit | 558301034741d52ea37eba8957d16291d507e015 (patch) | |
| tree | 2649b2fb0c7fb57ffc788ec72e95215c52577f68 /src | |
| parent | c82b2bc590a39694948b685ca1f715a9ad0ecc08 (diff) | |
| parent | cbccc4a59770f5124762e5fdb2085ff8b04e51cd (diff) | |
Rollup merge of #92371 - dtolnay:attrblock, r=oli-obk
Remove pretty printer space inside block with only outer attrs
Follow-up to #92238 fixing one of the FIXMEs.
```rust
macro_rules! repro {
($expr:expr) => {
stringify!($expr)
};
}
fn main() {
println!("{}", repro!(#[attr] {}));
}
```
Before: `#[attr] { }`
After: `#[attr] {}`
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/pretty/attr-fn-inner.rs | 4 | ||||
| -rw-r--r-- | src/test/pretty/attr-literals.rs | 4 | ||||
| -rw-r--r-- | src/test/pretty/attr-tokens-raw-ident.rs | 2 | ||||
| -rw-r--r-- | src/test/pretty/delimited-token-groups.rs | 2 | ||||
| -rw-r--r-- | src/test/pretty/doc-comments.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/macros/stringify.rs | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/test/pretty/attr-fn-inner.rs b/src/test/pretty/attr-fn-inner.rs index 0a745e7d34f..6d9cb89f022 100644 --- a/src/test/pretty/attr-fn-inner.rs +++ b/src/test/pretty/attr-fn-inner.rs @@ -9,8 +9,8 @@ fn main() { #![rustc_dummy] #[rustc_dummy] - fn f() { } + fn f() {} #[rustc_dummy] - fn g() { } + fn g() {} } diff --git a/src/test/pretty/attr-literals.rs b/src/test/pretty/attr-literals.rs index 44d2c5db3e6..d132014420d 100644 --- a/src/test/pretty/attr-literals.rs +++ b/src/test/pretty/attr-literals.rs @@ -7,8 +7,8 @@ fn main() { #![rustc_dummy("hi", 1, 2, 1.012, pi = 3.14, bye, name("John"))] #[rustc_dummy = 8] - fn f() { } + fn f() {} #[rustc_dummy(1, 2, 3)] - fn g() { } + fn g() {} } diff --git a/src/test/pretty/attr-tokens-raw-ident.rs b/src/test/pretty/attr-tokens-raw-ident.rs index bb2c4bb558e..8486342b087 100644 --- a/src/test/pretty/attr-tokens-raw-ident.rs +++ b/src/test/pretty/attr-tokens-raw-ident.rs @@ -4,4 +4,4 @@ // pp-exact #[rustfmt::r#final(final)] -fn main() { } +fn main() {} diff --git a/src/test/pretty/delimited-token-groups.rs b/src/test/pretty/delimited-token-groups.rs index 257c032b536..1137d804564 100644 --- a/src/test/pretty/delimited-token-groups.rs +++ b/src/test/pretty/delimited-token-groups.rs @@ -45,4 +45,4 @@ mac! { }] #[rustc_dummy = "aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa"] -fn main() { } +fn main() {} diff --git a/src/test/pretty/doc-comments.rs b/src/test/pretty/doc-comments.rs index 2a98c9fc058..a49860daa6a 100644 --- a/src/test/pretty/doc-comments.rs +++ b/src/test/pretty/doc-comments.rs @@ -5,7 +5,7 @@ // some single-line non-doc comment /// some single line outer-docs -fn a() { } +fn a() {} fn b() { //! some single line inner-docs @@ -17,7 +17,7 @@ fn b() { ////////////////////////////////// /// some single-line outer-docs preceded by a separator /// (and trailing whitespaces) -fn c() { } +fn c() {} /* * some multi-line non-doc comment @@ -26,7 +26,7 @@ fn c() { } /** * some multi-line outer-docs */ -fn d() { } +fn d() {} fn e() { /*! @@ -43,10 +43,10 @@ fn e() { /** * some multi-line outer-docs preceded by a separator */ -fn f() { } +fn f() {} #[doc = "unsugared outer doc-comments work also"] -fn g() { } +fn g() {} fn h() { #![doc = "as do inner ones"] diff --git a/src/test/ui/macros/stringify.rs b/src/test/ui/macros/stringify.rs index fcf6a9278d8..f284ac727f4 100644 --- a/src/test/ui/macros/stringify.rs +++ b/src/test/ui/macros/stringify.rs @@ -235,7 +235,7 @@ fn test_expr() { #[attr] {} ), - "#[attr] { }", // FIXME + "#[attr] {}", ); assert_eq!( stringify_expr!( |
