Rollup merge of rust-lang#124099 - voidc:disallow-ambiguous-expr-attrs, r=davidtwco

matthiaskrgr · web-flow · commit 53b505697787 · 2024-04-23T12:10:26.000+02:00
Disallow ambiguous attributes on expressions This implements the suggestion in [rust-lang#15701](rust-lang#15701 (comment)) to disallow ambiguous outer attributes on expressions. This should resolve one of the concerns blocking the stabilization of `stmt_expr_attributes`.
diff --git a/tests/ui/cfg_attr_rustfmt.fixed b/tests/ui/cfg_attr_rustfmt.fixed
@@ -16,7 +16,7 @@ fn foo(
 
 fn skip_on_statements() {
     #[rustfmt::skip]
-    5+3;
+    { 5+3; }
 }
 
 #[rustfmt::skip]
@@ -33,11 +33,11 @@ mod foo {
 #[clippy::msrv = "1.29"]
 fn msrv_1_29() {
     #[cfg_attr(rustfmt, rustfmt::skip)]
-    1+29;
+    { 1+29; }
 }
 
 #[clippy::msrv = "1.30"]
 fn msrv_1_30() {
     #[rustfmt::skip]
-    1+30;
+    { 1+30; }
 }
diff --git a/tests/ui/cfg_attr_rustfmt.rs b/tests/ui/cfg_attr_rustfmt.rs
@@ -16,7 +16,7 @@ fn foo(
 
 fn skip_on_statements() {
     #[cfg_attr(rustfmt, rustfmt::skip)]
-    5+3;
+    { 5+3; }
 }
 
 #[cfg_attr(rustfmt, rustfmt_skip)]
@@ -33,11 +33,11 @@ mod foo {
 #[clippy::msrv = "1.29"]
 fn msrv_1_29() {
     #[cfg_attr(rustfmt, rustfmt::skip)]
-    1+29;
+    { 1+29; }
 }
 
 #[clippy::msrv = "1.30"]
 fn msrv_1_30() {
     #[cfg_attr(rustfmt, rustfmt::skip)]
-    1+30;
+    { 1+30; }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ fn foo(`
`16`	`16`
`17`	`17`	`fn skip_on_statements() {`
`18`	`18`	`#[rustfmt::skip]`
`19`		`- 5+3;`
	`19`	`+ { 5+3; }`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`#[rustfmt::skip]`
`@@ -33,11 +33,11 @@ mod foo {`
`33`	`33`	`#[clippy::msrv = "1.29"]`
`34`	`34`	`fn msrv_1_29() {`
`35`	`35`	`#[cfg_attr(rustfmt, rustfmt::skip)]`
`36`		`- 1+29;`
	`36`	`+ { 1+29; }`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`#[clippy::msrv = "1.30"]`
`40`	`40`	`fn msrv_1_30() {`
`41`	`41`	`#[rustfmt::skip]`
`42`		`- 1+30;`
	`42`	`+ { 1+30; }`
`43`	`43`	`}`