about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-12-27 08:57:45 +0100
committerGitHub <noreply@github.com>2022-12-27 08:57:45 +0100
commitb8d71fc41fe3476da0e4857294583eff271aa625 (patch)
tree828ce89bb01bc4161b4dc0f581a5b5315ac44ad1
parente3961864075eaa9e855e5eec6b4f148029684539 (diff)
parentfb3e4b349a7b9e7bceb1f222551483550ee42ab7 (diff)
downloadrust-b8d71fc41fe3476da0e4857294583eff271aa625.tar.gz
rust-b8d71fc41fe3476da0e4857294583eff271aa625.zip
Rollup merge of #105515 - estebank:issue-104141, r=oli-obk
Account for macros in const generics

Fix #104141.
-rw-r--r--compiler/rustc_lint/src/unused.rs1
-rw-r--r--src/test/ui/lint/unused_braces_macro.rs6
2 files changed, 7 insertions, 0 deletions
diff --git a/compiler/rustc_lint/src/unused.rs b/compiler/rustc_lint/src/unused.rs
index 3b8df61a0ea..a7a5234049f 100644
--- a/compiler/rustc_lint/src/unused.rs
+++ b/compiler/rustc_lint/src/unused.rs
@@ -1142,6 +1142,7 @@ impl UnusedDelimLint for UnusedBraces {
                             && !cx.sess().source_map().is_multiline(value.span)
                             && value.attrs.is_empty()
                             && !value.span.from_expansion()
+                            && !inner.span.from_expansion()
                         {
                             self.emit_unused_delims_expr(cx, value, ctx, left_pos, right_pos)
                         }
diff --git a/src/test/ui/lint/unused_braces_macro.rs b/src/test/ui/lint/unused_braces_macro.rs
new file mode 100644
index 00000000000..bfee95378bf
--- /dev/null
+++ b/src/test/ui/lint/unused_braces_macro.rs
@@ -0,0 +1,6 @@
+// build-pass
+pub fn foo<const BAR: bool> () {}
+
+fn main() {
+    foo::<{cfg!(feature = "foo")}>();
+}