dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skip `unused_parens`'s suggestion for `Paren` in macro. 

fixes #120642
This commit is contained in:
surechen 2024-04-01 14:44:52 +08:00
parent b14d8b2ef2
commit c8490a0608
3 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1074,10 +1074,14 @@ impl UnusedParens {
// Otherwise proceed with linting.
_ => {}
}
let spans = inner
.span
.find_ancestor_inside(value.span)
.map(|inner| (value.span.with_hi(inner.lo()), value.span.with_lo(inner.hi())));
let spans = if !value.span.from_expansion() {
inner
.span
.find_ancestor_inside(value.span)
.map(|inner| (value.span.with_hi(inner.lo()), value.span.with_lo(inner.hi())))
} else {
None
};
self.emit_unused_delims(cx, value.span, spans, "pattern", keep_space, false);
}
}
@ -1233,11 +1237,13 @@ impl EarlyLintPass for UnusedParens {
if self.with_self_ty_parens && b.generic_params.len() > 0 => {}
ast::TyKind::ImplTrait(_, bounds) if bounds.len() > 1 => {}
_ => {
let spans = r
.span
.find_ancestor_inside(ty.span)
.map(|r| (ty.span.with_hi(r.lo()), ty.span.with_lo(r.hi())));
let spans = if !ty.span.from_expansion() {
r.span
.find_ancestor_inside(ty.span)
.map(|r| (ty.span.with_hi(r.lo()), ty.span.with_lo(r.hi())))
} else {
None
};
self.emit_unused_delims(cx, ty.span, spans, "type", (false, false), false);
}
}

39
tests/ui/lint/unused/unused_parens/unused-parens-in-macro-issue-120642.rs Normal file
View File

@ -0,0 +1,39 @@
//@ run-pass
#![warn(unused_parens)]
#![allow(dead_code)]
trait Foo {
fn bar();
fn tar();
}
macro_rules! unused_parens {
($ty:ident) => {
impl<$ty: Foo> Foo for ($ty,) {
fn bar() { <$ty>::bar() }
fn tar() {}
}
};
($ty:ident $(, $rest:ident)*) => {
impl<$ty: Foo, $($rest: Foo),*> Foo for ($ty, $($rest),*) {
fn bar() {
<$ty>::bar();
<($($rest),*)>::bar() //~WARN unnecessary parentheses around type
}
fn tar() {
let (_t) = 1; //~WARN unnecessary parentheses around pattern
//~| WARN unnecessary parentheses around pattern
let (_t1,) = (1,);
let (_t2, _t3) = (1, 2);
}
}
unused_parens!($($rest),*);
}
}
unused_parens!(T1, T2, T3);
fn main() {}

40
tests/ui/lint/unused/unused_parens/unused-parens-in-macro-issue-120642.stderr Normal file
View File

@ -0,0 +1,40 @@
warning: unnecessary parentheses around pattern
--> $DIR/unused-parens-in-macro-issue-120642.rs:26:19
|
LL | let (_t) = 1;
| ^^^^
...
LL | unused_parens!(T1, T2, T3);
| -------------------------- in this macro invocation
|
note: the lint level is defined here
--> $DIR/unused-parens-in-macro-issue-120642.rs:3:9
|
LL | #![warn(unused_parens)]
| ^^^^^^^^^^^^^
= note: this warning originates in the macro `unused_parens` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: unnecessary parentheses around type
--> $DIR/unused-parens-in-macro-issue-120642.rs:23:18
|
LL | <($($rest),*)>::bar()
| ^^^^^^^^^^^^
...
LL | unused_parens!(T1, T2, T3);
| -------------------------- in this macro invocation
|
= note: this warning originates in the macro `unused_parens` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: unnecessary parentheses around pattern
--> $DIR/unused-parens-in-macro-issue-120642.rs:26:19
|
LL | let (_t) = 1;
| ^^^^
...
LL | unused_parens!(T1, T2, T3);
| -------------------------- in this macro invocation
|
= note: this warning originates in the macro `unused_parens` (in Nightly builds, run with -Z macro-backtrace for more info)
warning: 3 warnings emitted