Skip to content

Commit 21a787d

Browse files
ada4aada4a
committed
fix(double_parens): don't lint in proc-macros
1 parent 1f09b33 commit 21a787d

File tree

6 files changed

+207
-16
lines changed

6 files changed

+207
-16
lines changed

‎clippy_lints/src/double_parens.rs‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::source::{HasSession, snippet_with_applicability, snippet_with_context};
2+
use clippy_utils::source::{HasSession, SpanRangeExt, snippet_with_applicability, snippet_with_context};
33
use rustc_ast::ast::{Expr, ExprKind, MethodCall};
44
use rustc_errors::Applicability;
55
use rustc_lint::{EarlyContext, EarlyLintPass};
@@ -47,8 +47,9 @@ impl EarlyLintPass for DoubleParens {
4747
// ^^^^^^ expr
4848
// ^^^^ inner
4949
ExprKind::Paren(inner) if matches!(inner.kind, ExprKind::Paren(_) | ExprKind::Tup(_)) => {
50-
// suggest removing the outer parens
51-
if expr.span.eq_ctxt(inner.span) {
50+
if expr.span.eq_ctxt(inner.span) && check_source(cx, inner) {
51+
// suggest removing the outer parens
52+
5253
let mut applicability = Applicability::MachineApplicable;
5354
// We don't need to use `snippet_with_context` here, because:
5455
// - if `inner`'s `ctxt` is from macro, we don't lint in the first place (see the check above)
@@ -74,8 +75,9 @@ impl EarlyLintPass for DoubleParens {
7475
if let [arg] = &**args
7576
&& let ExprKind::Paren(inner) = &arg.kind =>
7677
{
77-
// suggest removing the inner parens
78-
if expr.span.eq_ctxt(arg.span) {
78+
if expr.span.eq_ctxt(arg.span) && check_source(cx, arg) {
79+
// suggest removing the inner parens
80+
7981
let mut applicability = Applicability::MachineApplicable;
8082
let sugg = snippet_with_context(cx.sess(), inner.span, arg.span.ctxt(), "_", &mut applicability).0;
8183
span_lint_and_sugg(
@@ -93,3 +95,22 @@ impl EarlyLintPass for DoubleParens {
9395
}
9496
}
9597
}
98+
99+
/// Check that the span does indeed look like `( (..) )`
100+
fn check_source(cx: &EarlyContext<'_>, inner: &Expr) -> bool {
101+
if let Some(sfr) = inner.span.get_source_range(cx)
102+
// this is the same as `SourceFileRange::as_str`, but doesn't apply the range right away, because
103+
// we're interested in the source code outside it
104+
&& let Some(src) = sfr.sf.src.as_ref().map(|src| src.as_str())
105+
&& let Some((start, outer_after_inner)) = src.split_at_checked(sfr.range.end)
106+
&& let Some((outer_before_inner, inner)) = start.split_at_checked(sfr.range.start)
107+
&& outer_before_inner.trim_end().ends_with('(')
108+
&& inner.starts_with('(')
109+
&& inner.ends_with(')')
110+
&& outer_after_inner.trim_start().starts_with(')')
111+
{
112+
true
113+
} else {
114+
false
115+
}
116+
}

‎tests/ui/auxiliary/macro_rules.rs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,15 @@ macro_rules! bad_transmute {
5757
std::mem::transmute($e)
5858
};
5959
}
60+
61+
#[macro_export]
62+
#[rustfmt::skip]
63+
macro_rules! double_parens {
64+
($a:expr, $b:expr, $c:expr, $d:expr) => {{
65+
let a = ($a);
66+
let a = (());
67+
let b = ((5));
68+
let c = std::convert::identity((5));
69+
InterruptMask((($a.union($b).union($c).union($d)).into_bits()) as u32)
70+
}};
71+
}

‎tests/ui/auxiliary/proc_macro_derive.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,14 @@ pub fn allow_lint_same_span_derive(input: TokenStream) -> TokenStream {
230230
span_help(Group::new(Delimiter::Brace, TokenStream::new()).into()),
231231
])
232232
}
233+
234+
#[proc_macro_derive(DoubleParens)]
235+
pub fn derive_double_parens(_: TokenStream) -> TokenStream {
236+
quote! {
237+
fn foo() {
238+
let a = (());
239+
let b = ((5));
240+
let c = std::convert::identity((5));
241+
}
242+
}
243+
}

‎tests/ui/double_parens.fixed‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
//@aux-build:proc_macros.rs
2+
//@aux-build:proc_macro_derive.rs
3+
//@aux-build:macro_rules.rs
14
#![warn(clippy::double_parens)]
25
#![expect(clippy::eq_op, clippy::no_effect)]
36
#![feature(custom_inner_attributes)]
47
#![rustfmt::skip]
58

9+
use proc_macros::{external, with_span};
10+
611
fn dummy_fn<T>(_: T) {}
712

813
struct DummyStruct;
@@ -96,4 +101,56 @@ fn issue9000(x: DummyStruct) {
96101
//~^ double_parens
97102
}
98103

104+
fn issue15892() {
105+
use macro_rules::double_parens as double_parens_external;
106+
107+
macro_rules! double_parens{
108+
($a:expr, $b:expr, $c:expr, $d:expr) => {{
109+
let a = ($a);
110+
let a = ();
111+
//~^ double_parens
112+
let b = (5);
113+
//~^ double_parens
114+
let c = std::convert::identity(5);
115+
//~^ double_parens
116+
InterruptMask((($a.union($b).union($c).union($d)).into_bits()) as u32)
117+
}};
118+
}
119+
120+
#[repr(transparent)]
121+
#[derive(Clone, Copy, PartialEq, Eq)]
122+
pub struct InterruptMask(u32);
123+
124+
impl InterruptMask {
125+
pub const OE: InterruptMask = InterruptMask(1 << 10);
126+
pub const BE: InterruptMask = InterruptMask(1 << 9);
127+
pub const PE: InterruptMask = InterruptMask(1 << 8);
128+
pub const FE: InterruptMask = InterruptMask(1 << 7);
129+
pub const E: InterruptMask = double_parens!((Self::OE), Self::BE, Self::PE, Self::FE);
130+
pub const F: InterruptMask = double_parens_external!((Self::OE), Self::BE, Self::PE, Self::FE);
131+
#[allow(clippy::unnecessary_cast)]
132+
pub const G: InterruptMask = external!(
133+
InterruptMask((((Self::OE.union(Self::BE).union(Self::PE).union(Self::FE))).into_bits()) as u32)
134+
);
135+
#[allow(clippy::unnecessary_cast)]
136+
pub const H: InterruptMask = with_span!(span
137+
InterruptMask((((Self::OE.union(Self::BE).union(Self::PE).union(Self::FE))).into_bits()) as u32)
138+
);
139+
pub const fn into_bits(self) -> u32 {
140+
self.0
141+
}
142+
#[must_use]
143+
pub const fn union(self, rhs: Self) -> Self {
144+
InterruptMask(self.0 | rhs.0)
145+
}
146+
}
147+
}
148+
149+
fn issue15940() {
150+
use proc_macro_derive::DoubleParens;
151+
152+
#[derive(DoubleParens)]
153+
pub struct Person;
154+
}
155+
99156
fn main() {}

‎tests/ui/double_parens.rs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
//@aux-build:proc_macros.rs
2+
//@aux-build:proc_macro_derive.rs
3+
//@aux-build:macro_rules.rs
14
#![warn(clippy::double_parens)]
25
#![expect(clippy::eq_op, clippy::no_effect)]
36
#![feature(custom_inner_attributes)]
47
#![rustfmt::skip]
58

9+
use proc_macros::{external, with_span};
10+
611
fn dummy_fn<T>(_: T) {}
712

813
struct DummyStruct;
@@ -96,4 +101,56 @@ fn issue9000(x: DummyStruct) {
96101
//~^ double_parens
97102
}
98103

104+
fn issue15892() {
105+
use macro_rules::double_parens as double_parens_external;
106+
107+
macro_rules! double_parens{
108+
($a:expr, $b:expr, $c:expr, $d:expr) => {{
109+
let a = ($a);
110+
let a = (());
111+
//~^ double_parens
112+
let b = ((5));
113+
//~^ double_parens
114+
let c = std::convert::identity((5));
115+
//~^ double_parens
116+
InterruptMask((($a.union($b).union($c).union($d)).into_bits()) as u32)
117+
}};
118+
}
119+
120+
#[repr(transparent)]
121+
#[derive(Clone, Copy, PartialEq, Eq)]
122+
pub struct InterruptMask(u32);
123+
124+
impl InterruptMask {
125+
pub const OE: InterruptMask = InterruptMask(1 << 10);
126+
pub const BE: InterruptMask = InterruptMask(1 << 9);
127+
pub const PE: InterruptMask = InterruptMask(1 << 8);
128+
pub const FE: InterruptMask = InterruptMask(1 << 7);
129+
pub const E: InterruptMask = double_parens!((Self::OE), Self::BE, Self::PE, Self::FE);
130+
pub const F: InterruptMask = double_parens_external!((Self::OE), Self::BE, Self::PE, Self::FE);
131+
#[allow(clippy::unnecessary_cast)]
132+
pub const G: InterruptMask = external!(
133+
InterruptMask((((Self::OE.union(Self::BE).union(Self::PE).union(Self::FE))).into_bits()) as u32)
134+
);
135+
#[allow(clippy::unnecessary_cast)]
136+
pub const H: InterruptMask = with_span!(span
137+
InterruptMask((((Self::OE.union(Self::BE).union(Self::PE).union(Self::FE))).into_bits()) as u32)
138+
);
139+
pub const fn into_bits(self) -> u32 {
140+
self.0
141+
}
142+
#[must_use]
143+
pub const fn union(self, rhs: Self) -> Self {
144+
InterruptMask(self.0 | rhs.0)
145+
}
146+
}
147+
}
148+
149+
fn issue15940() {
150+
use proc_macro_derive::DoubleParens;
151+
152+
#[derive(DoubleParens)]
153+
pub struct Person;
154+
}
155+
99156
fn main() {}

‎tests/ui/double_parens.stderr‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unnecessary parentheses
2-
--> tests/ui/double_parens.rs:15:5
2+
--> tests/ui/double_parens.rs:20:5
33
|
44
LL | ((0))
55
| ^^^^^ help: remove them: `(0)`
@@ -8,37 +8,37 @@ LL | ((0))
88
= help: to override `-D warnings` add `#[allow(clippy::double_parens)]`
99

1010
error: unnecessary parentheses
11-
--> tests/ui/double_parens.rs:20:14
11+
--> tests/ui/double_parens.rs:25:14
1212
|
1313
LL | dummy_fn((0));
1414
| ^^^ help: remove them: `0`
1515

1616
error: unnecessary parentheses
17-
--> tests/ui/double_parens.rs:25:20
17+
--> tests/ui/double_parens.rs:30:20
1818
|
1919
LL | x.dummy_method((0));
2020
| ^^^ help: remove them: `0`
2121

2222
error: unnecessary parentheses
23-
--> tests/ui/double_parens.rs:30:5
23+
--> tests/ui/double_parens.rs:35:5
2424
|
2525
LL | ((1, 2))
2626
| ^^^^^^^^ help: remove them: `(1, 2)`
2727

2828
error: unnecessary parentheses
29-
--> tests/ui/double_parens.rs:36:5
29+
--> tests/ui/double_parens.rs:41:5
3030
|
3131
LL | (())
3232
| ^^^^ help: remove them: `()`
3333

3434
error: unnecessary parentheses
35-
--> tests/ui/double_parens.rs:59:16
35+
--> tests/ui/double_parens.rs:64:16
3636
|
3737
LL | assert_eq!(((1, 2)), (1, 2), "Error");
3838
| ^^^^^^^^ help: remove them: `(1, 2)`
3939

4040
error: unnecessary parentheses
41-
--> tests/ui/double_parens.rs:84:16
41+
--> tests/ui/double_parens.rs:89:16
4242
|
4343
LL | () => {((100))}
4444
| ^^^^^^^ help: remove them: `(100)`
@@ -49,22 +49,55 @@ LL | bar!();
4949
= note: this error originates in the macro `bar` (in Nightly builds, run with -Z macro-backtrace for more info)
5050

5151
error: unnecessary parentheses
52-
--> tests/ui/double_parens.rs:91:5
52+
--> tests/ui/double_parens.rs:96:5
5353
|
5454
LL | ((vec![1, 2]));
5555
| ^^^^^^^^^^^^^^ help: remove them: `(vec![1, 2])`
5656

5757
error: unnecessary parentheses
58-
--> tests/ui/double_parens.rs:93:14
58+
--> tests/ui/double_parens.rs:98:14
5959
|
6060
LL | dummy_fn((vec![1, 2]));
6161
| ^^^^^^^^^^^^ help: remove them: `vec![1, 2]`
6262

6363
error: unnecessary parentheses
64-
--> tests/ui/double_parens.rs:95:20
64+
--> tests/ui/double_parens.rs:100:20
6565
|
6666
LL | x.dummy_method((vec![1, 2]));
6767
| ^^^^^^^^^^^^ help: remove them: `vec![1, 2]`
6868

69-
error: aborting due to 10 previous errors
69+
error: unnecessary parentheses
70+
--> tests/ui/double_parens.rs:110:21
71+
|
72+
LL | let a = (());
73+
| ^^^^ help: remove them: `()`
74+
...
75+
LL | pub const E: InterruptMask = double_parens!((Self::OE), Self::BE, Self::PE, Self::FE);
76+
| -------------------------------------------------------- in this macro invocation
77+
|
78+
= note: this error originates in the macro `double_parens` (in Nightly builds, run with -Z macro-backtrace for more info)
79+
80+
error: unnecessary parentheses
81+
--> tests/ui/double_parens.rs:112:21
82+
|
83+
LL | let b = ((5));
84+
| ^^^^^ help: remove them: `(5)`
85+
...
86+
LL | pub const E: InterruptMask = double_parens!((Self::OE), Self::BE, Self::PE, Self::FE);
87+
| -------------------------------------------------------- in this macro invocation
88+
|
89+
= note: this error originates in the macro `double_parens` (in Nightly builds, run with -Z macro-backtrace for more info)
90+
91+
error: unnecessary parentheses
92+
--> tests/ui/double_parens.rs:114:44
93+
|
94+
LL | let c = std::convert::identity((5));
95+
| ^^^ help: remove them: `5`
96+
...
97+
LL | pub const E: InterruptMask = double_parens!((Self::OE), Self::BE, Self::PE, Self::FE);
98+
| -------------------------------------------------------- in this macro invocation
99+
|
100+
= note: this error originates in the macro `double_parens` (in Nightly builds, run with -Z macro-backtrace for more info)
101+
102+
error: aborting due to 13 previous errors
70103

0 commit comments

Comments
 (0)