Skip to content

Commit c6e8f62

Browse files
UrgauUrgau
committed
Lint on ambiguous precedence expressions even if method calls are odd
1 parent 1cb9b4d commit c6e8f62

File tree

4 files changed

+93
-83
lines changed

4 files changed

+93
-83
lines changed

‎compiler/rustc_lint/src/precedence.rs

+5-28
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,6 @@ use rustc_span::source_map::Spanned;
55
use crate::lints::{PrecedenceDiag, PrecedenceUnarySuggestion, PrecedenceUnwarySuggestion};
66
use crate::{EarlyContext, EarlyLintPass, LintContext};
77

8-
// List of functions `f(x)` where `f(-x)=-f(x)` so the
9-
// precedence doens't matter.
10-
const ALLOWED_ODD_FUNCTIONS: [&str; 14] = [
11-
"asin",
12-
"asinh",
13-
"atan",
14-
"atanh",
15-
"cbrt",
16-
"fract",
17-
"round",
18-
"signum",
19-
"sin",
20-
"sinh",
21-
"tan",
22-
"tanh",
23-
"to_degrees",
24-
"to_radians",
25-
];
26-
278
declare_lint! {
289
/// The `ambiguous_precedence` lint checks for operations where
2910
/// precedence may be unclear and suggests adding parentheses.
@@ -86,19 +67,15 @@ impl EarlyLintPass for Precedence {
8667
);
8768
}
8869

89-
if let ExprKind::Unary(UnOp::Neg, operand) = &expr.kind {
70+
if let ExprKind::Unary(UnOp::Neg, operand) = &expr.kind
71+
&& let ExprKind::MethodCall(..) = operand.kind
72+
{
9073
let mut arg = operand;
91-
92-
let mut all_odd = true;
93-
while let ExprKind::MethodCall(box MethodCall { seg, receiver, .. }) = &arg.kind {
94-
let seg_str = seg.ident.name.as_str();
95-
all_odd &=
96-
ALLOWED_ODD_FUNCTIONS.iter().any(|odd_function| **odd_function == *seg_str);
74+
while let ExprKind::MethodCall(box MethodCall { receiver, .. }) = &arg.kind {
9775
arg = receiver;
9876
}
9977

100-
if !all_odd
101-
&& let ExprKind::Lit(lit) = &arg.kind
78+
if let ExprKind::Lit(lit) = &arg.kind
10279
&& let LitKind::Integer | LitKind::Float = &lit.kind
10380
{
10481
cx.emit_spanned_lint(AMBIGUOUS_PRECEDENCE, expr.span, PrecedenceDiag::Unary {

‎tests/ui/lint/precedence.fixed

+16-27
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@ fn main() {
2222
//~^ WARN unary minus has lower precedence than method call
2323
let _ = -(1f32.abs());
2424
//~^ WARN unary minus has lower precedence than method call
25+
let _ = -(1f64.asin());
26+
//~^ WARN unary minus has lower precedence than method call
27+
let _ = -(1f64.asinh());
28+
//~^ WARN unary minus has lower precedence than method call
29+
let _ = -(1f64.tan());
30+
//~^ WARN unary minus has lower precedence than method call
31+
let _ = -(1f64.tanh());
32+
//~^ WARN unary minus has lower precedence than method call
33+
let _ = -(1.0_f64.cos().cos());
34+
//~^ WARN unary minus has lower precedence than method call
35+
let _ = -(1.0_f64.cos().sin());
36+
//~^ WARN unary minus has lower precedence than method call
37+
let _ = -(1.0_f64.sin().cos());
38+
//~^ WARN unary minus has lower precedence than method call
39+
let _ = -(1f64.sin().sin());
40+
//~^ WARN unary minus has lower precedence than method call
2541

2642
// These should not trigger an error
2743
let _ = (-1i32).abs();
@@ -30,31 +46,4 @@ fn main() {
3046
let _ = -(1f32).abs();
3147
let _ = -(1i32.abs());
3248
let _ = -(1f32.abs());
33-
34-
// Odd functions should not trigger an error
35-
let _ = -1f64.asin();
36-
let _ = -1f64.asinh();
37-
let _ = -1f64.atan();
38-
let _ = -1f64.atanh();
39-
let _ = -1f64.cbrt();
40-
let _ = -1f64.fract();
41-
let _ = -1f64.round();
42-
let _ = -1f64.signum();
43-
let _ = -1f64.sin();
44-
let _ = -1f64.sinh();
45-
let _ = -1f64.tan();
46-
let _ = -1f64.tanh();
47-
let _ = -1f64.to_degrees();
48-
let _ = -1f64.to_radians();
49-
50-
// Chains containing any non-odd function should trigger (issue clippy#5924)
51-
let _ = -(1.0_f64.cos().cos());
52-
//~^ WARN unary minus has lower precedence than method call
53-
let _ = -(1.0_f64.cos().sin());
54-
//~^ WARN unary minus has lower precedence than method call
55-
let _ = -(1.0_f64.sin().cos());
56-
//~^ WARN unary minus has lower precedence than method call
57-
58-
// Chains of odd functions shouldn't trigger
59-
let _ = -1f64.sin().sin();
6049
}

‎tests/ui/lint/precedence.rs

+13-24
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,28 @@ fn main() {
2222
//~^ WARN unary minus has lower precedence than method call
2323
let _ = -1f32.abs();
2424
//~^ WARN unary minus has lower precedence than method call
25-
26-
// These should not trigger an error
27-
let _ = (-1i32).abs();
28-
let _ = (-1f32).abs();
29-
let _ = -(1i32).abs();
30-
let _ = -(1f32).abs();
31-
let _ = -(1i32.abs());
32-
let _ = -(1f32.abs());
33-
34-
// Odd functions should not trigger an error
3525
let _ = -1f64.asin();
26+
//~^ WARN unary minus has lower precedence than method call
3627
let _ = -1f64.asinh();
37-
let _ = -1f64.atan();
38-
let _ = -1f64.atanh();
39-
let _ = -1f64.cbrt();
40-
let _ = -1f64.fract();
41-
let _ = -1f64.round();
42-
let _ = -1f64.signum();
43-
let _ = -1f64.sin();
44-
let _ = -1f64.sinh();
28+
//~^ WARN unary minus has lower precedence than method call
4529
let _ = -1f64.tan();
30+
//~^ WARN unary minus has lower precedence than method call
4631
let _ = -1f64.tanh();
47-
let _ = -1f64.to_degrees();
48-
let _ = -1f64.to_radians();
49-
50-
// Chains containing any non-odd function should trigger (issue clippy#5924)
32+
//~^ WARN unary minus has lower precedence than method call
5133
let _ = -1.0_f64.cos().cos();
5234
//~^ WARN unary minus has lower precedence than method call
5335
let _ = -1.0_f64.cos().sin();
5436
//~^ WARN unary minus has lower precedence than method call
5537
let _ = -1.0_f64.sin().cos();
5638
//~^ WARN unary minus has lower precedence than method call
57-
58-
// Chains of odd functions shouldn't trigger
5939
let _ = -1f64.sin().sin();
40+
//~^ WARN unary minus has lower precedence than method call
41+
42+
// These should not trigger an error
43+
let _ = (-1i32).abs();
44+
let _ = (-1f32).abs();
45+
let _ = -(1i32).abs();
46+
let _ = -(1f32).abs();
47+
let _ = -(1i32.abs());
48+
let _ = -(1f32.abs());
6049
}

‎tests/ui/lint/precedence.stderr

+59-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,51 @@ LL | let _ = -(1f32.abs());
110110
| + +
111111

112112
warning: unary minus has lower precedence than method call
113-
--> $DIR/precedence.rs:51:13
113+
--> $DIR/precedence.rs:25:13
114+
|
115+
LL | let _ = -1f64.asin();
116+
| ^^^^^^^^^^^^
117+
|
118+
help: consider adding parentheses to clarify your intent
119+
|
120+
LL | let _ = -(1f64.asin());
121+
| + +
122+
123+
warning: unary minus has lower precedence than method call
124+
--> $DIR/precedence.rs:27:13
125+
|
126+
LL | let _ = -1f64.asinh();
127+
| ^^^^^^^^^^^^^
128+
|
129+
help: consider adding parentheses to clarify your intent
130+
|
131+
LL | let _ = -(1f64.asinh());
132+
| + +
133+
134+
warning: unary minus has lower precedence than method call
135+
--> $DIR/precedence.rs:29:13
136+
|
137+
LL | let _ = -1f64.tan();
138+
| ^^^^^^^^^^^
139+
|
140+
help: consider adding parentheses to clarify your intent
141+
|
142+
LL | let _ = -(1f64.tan());
143+
| + +
144+
145+
warning: unary minus has lower precedence than method call
146+
--> $DIR/precedence.rs:31:13
147+
|
148+
LL | let _ = -1f64.tanh();
149+
| ^^^^^^^^^^^^
150+
|
151+
help: consider adding parentheses to clarify your intent
152+
|
153+
LL | let _ = -(1f64.tanh());
154+
| + +
155+
156+
warning: unary minus has lower precedence than method call
157+
--> $DIR/precedence.rs:33:13
114158
|
115159
LL | let _ = -1.0_f64.cos().cos();
116160
| ^^^^^^^^^^^^^^^^^^^^
@@ -121,7 +165,7 @@ LL | let _ = -(1.0_f64.cos().cos());
121165
| + +
122166

123167
warning: unary minus has lower precedence than method call
124-
--> $DIR/precedence.rs:53:13
168+
--> $DIR/precedence.rs:35:13
125169
|
126170
LL | let _ = -1.0_f64.cos().sin();
127171
| ^^^^^^^^^^^^^^^^^^^^
@@ -132,7 +176,7 @@ LL | let _ = -(1.0_f64.cos().sin());
132176
| + +
133177

134178
warning: unary minus has lower precedence than method call
135-
--> $DIR/precedence.rs:55:13
179+
--> $DIR/precedence.rs:37:13
136180
|
137181
LL | let _ = -1.0_f64.sin().cos();
138182
| ^^^^^^^^^^^^^^^^^^^^
@@ -142,5 +186,16 @@ help: consider adding parentheses to clarify your intent
142186
LL | let _ = -(1.0_f64.sin().cos());
143187
| + +
144188

145-
warning: 13 warnings emitted
189+
warning: unary minus has lower precedence than method call
190+
--> $DIR/precedence.rs:39:13
191+
|
192+
LL | let _ = -1f64.sin().sin();
193+
| ^^^^^^^^^^^^^^^^^
194+
|
195+
help: consider adding parentheses to clarify your intent
196+
|
197+
LL | let _ = -(1f64.sin().sin());
198+
| + +
199+
200+
warning: 18 warnings emitted
146201

0 commit comments

Comments
 (0)