Skip to content

Commit d7bc758

Browse files
authored
Rollup merge of #106563 - clubby789:gce-macro-braces, r=TaKO8Ki
Fix `unused_braces` on generic const expr macro call Fixes #106545 `@rustbot` label +A-const-generics +A-lint
2 parents 085d2f1 + 4f64de8 commit d7bc758

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

compiler/rustc_lint/src/unused.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,7 @@ impl UnusedDelimLint for UnusedBraces {
11051105
|| matches!(expr.kind, ast::ExprKind::Lit(_)))
11061106
&& !cx.sess().source_map().is_multiline(value.span)
11071107
&& value.attrs.is_empty()
1108+
&& !expr.span.from_expansion()
11081109
&& !value.span.from_expansion()
11091110
&& !inner.span.from_expansion()
11101111
{

tests/ui/const-generics/unused_braces.fixed

+7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
// run-rustfix
33
#![warn(unused_braces)]
44

5+
macro_rules! make_1 {
6+
() => {
7+
1
8+
}
9+
}
10+
511
struct A<const N: usize>;
612

713
fn main() {
814
let _: A<7>; // ok
915
let _: A<7>; //~ WARN unnecessary braces
1016
let _: A<{ 3 + 5 }>; // ok
17+
let _: A<{make_1!()}>; // ok
1118
}

tests/ui/const-generics/unused_braces.rs

+7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
// run-rustfix
33
#![warn(unused_braces)]
44

5+
macro_rules! make_1 {
6+
() => {
7+
1
8+
}
9+
}
10+
511
struct A<const N: usize>;
612

713
fn main() {
814
let _: A<7>; // ok
915
let _: A<{ 7 }>; //~ WARN unnecessary braces
1016
let _: A<{ 3 + 5 }>; // ok
17+
let _: A<{make_1!()}>; // ok
1118
}

tests/ui/const-generics/unused_braces.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: unnecessary braces around const expression
2-
--> $DIR/unused_braces.rs:9:14
2+
--> $DIR/unused_braces.rs:15:14
33
|
44
LL | let _: A<{ 7 }>;
55
| ^^ ^^

0 commit comments

Comments
 (0)