nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in unused_braces with macros

Browse Source
This commit is contained in:
clubby789 2023-01-15 05:06:33 +00:00
parent 754f6d4a8c
commit 295f5483fe
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_lint/src/unused.rs
View File

@ -1095,17 +1095,21 @@ impl UnusedDelimLint for UnusedBraces {
// ```
// - the block has no attribute and was not created inside a macro
// - if the block is an `anon_const`, the inner expr must be a literal
// (do not lint `struct A<const N: usize>; let _: A<{ 2 + 3 }>;`)
//
// not created by a macro, i.e. do not lint on:
// ```
// struct A<const N: usize>;
// let _: A<{ 2 + 3 }>;
// let _: A<{produces_literal!()}>;
// ```
// FIXME(const_generics): handle paths when #67075 is fixed.
if let [stmt] = inner.stmts.as_slice() {
if let ast::StmtKind::Expr(ref expr) = stmt.kind {
if !Self::is_expr_delims_necessary(expr, followed_by_block, false)
&& (ctx != UnusedDelimsCtx::AnonConst
|| matches!(expr.kind, ast::ExprKind::Lit(_)))
|| (matches!(expr.kind, ast::ExprKind::Lit(_))
&& !expr.span.from_expansion()))
&& !cx.sess().source_map().is_multiline(value.span)
&& value.attrs.is_empty()
&& !expr.span.from_expansion()
&& !value.span.from_expansion()
&& !inner.span.from_expansion()
{

4
tests/ui/lint/unused_braces.fixed
View File

@ -50,4 +50,8 @@ fn main() {
if { return } {
}
// regression test for https://github.com/rust-lang/rust/issues/106899
return println!("!");
//~^ WARN unnecessary braces
}

4
tests/ui/lint/unused_braces.rs
View File

@ -50,4 +50,8 @@ fn main() {
if { return } {
}
// regression test for https://github.com/rust-lang/rust/issues/106899
return { println!("!") };
//~^ WARN unnecessary braces
}

14
tests/ui/lint/unused_braces.stderr
View File

@ -68,5 +68,17 @@ LL - consume({ 7 });
LL + consume(7);
|
warning: 5 warnings emitted
warning: unnecessary braces around `return` value
--> $DIR/unused_braces.rs:55:12
|
LL | return { println!("!") };
| ^^ ^^
|
help: remove these braces
|
LL - return { println!("!") };
LL + return println!("!");
|
warning: 6 warnings emitted