Skip to content

Commit cf8bc84

Browse files
committed
Auto merge of #126108 - workingjubilee:rollup-g7m92b6, r=workingjubilee
Rollup of 7 pull requests Successful merges: - #125606 (Size optimize int formatting) - #125724 (Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`) - #126040 (Don't warn on fields in the `unreachable_pub` lint ) - #126098 (Remove `same-lib-two-locations-no-panic` run-make test) - #126099 (Crate loader cleanups) - #126101 (Revert "Disallow ambiguous attributes on expressions" on nightly) - #126103 (Improve Docs for `hir::Impl` and `hir::ImplItem`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1860be4 + c860bde commit cf8bc84

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tests/ui/cfg_attr_rustfmt.fixed

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn foo(
1616

1717
fn skip_on_statements() {
1818
#[rustfmt::skip]
19-
{ 5+3; }
19+
5+3;
2020
}
2121

2222
#[rustfmt::skip]
@@ -33,11 +33,11 @@ mod foo {
3333
#[clippy::msrv = "1.29"]
3434
fn msrv_1_29() {
3535
#[cfg_attr(rustfmt, rustfmt::skip)]
36-
{ 1+29; }
36+
1+29;
3737
}
3838

3939
#[clippy::msrv = "1.30"]
4040
fn msrv_1_30() {
4141
#[rustfmt::skip]
42-
{ 1+30; }
42+
1+30;
4343
}

tests/ui/cfg_attr_rustfmt.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn foo(
1616

1717
fn skip_on_statements() {
1818
#[cfg_attr(rustfmt, rustfmt::skip)]
19-
{ 5+3; }
19+
5+3;
2020
}
2121

2222
#[cfg_attr(rustfmt, rustfmt_skip)]
@@ -33,11 +33,11 @@ mod foo {
3333
#[clippy::msrv = "1.29"]
3434
fn msrv_1_29() {
3535
#[cfg_attr(rustfmt, rustfmt::skip)]
36-
{ 1+29; }
36+
1+29;
3737
}
3838

3939
#[clippy::msrv = "1.30"]
4040
fn msrv_1_30() {
4141
#[cfg_attr(rustfmt, rustfmt::skip)]
42-
{ 1+30; }
42+
1+30;
4343
}

0 commit comments

Comments
 (0)