Skip to content

Commit 590b91d

Browse files
committed
double-parens: make lint adhere to lint message convention and do minor refactoring
1 parent ba7a01a commit 590b91d

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

clippy_lints/src/double_parens.rs

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,41 +45,28 @@ impl EarlyLintPass for DoubleParens {
4545
return;
4646
}
4747

48+
let msg: &str = "consider removing unnecessary double parentheses";
49+
4850
match expr.kind {
4951
ExprKind::Paren(ref in_paren) => match in_paren.kind {
5052
ExprKind::Paren(_) | ExprKind::Tup(_) => {
51-
span_lint(
52-
cx,
53-
DOUBLE_PARENS,
54-
expr.span,
55-
"Consider removing unnecessary double parentheses",
56-
);
53+
span_lint(cx, DOUBLE_PARENS, expr.span, &msg);
5754
},
5855
_ => {},
5956
},
6057
ExprKind::Call(_, ref params) => {
6158
if params.len() == 1 {
6259
let param = &params[0];
6360
if let ExprKind::Paren(_) = param.kind {
64-
span_lint(
65-
cx,
66-
DOUBLE_PARENS,
67-
param.span,
68-
"Consider removing unnecessary double parentheses",
69-
);
61+
span_lint(cx, DOUBLE_PARENS, param.span, &msg);
7062
}
7163
}
7264
},
7365
ExprKind::MethodCall(_, ref params, _) => {
7466
if params.len() == 2 {
7567
let param = &params[1];
7668
if let ExprKind::Paren(_) = param.kind {
77-
span_lint(
78-
cx,
79-
DOUBLE_PARENS,
80-
param.span,
81-
"Consider removing unnecessary double parentheses",
82-
);
69+
span_lint(cx, DOUBLE_PARENS, param.span, &msg);
8370
}
8471
}
8572
},

tests/ui/double_parens.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
error: Consider removing unnecessary double parentheses
1+
error: consider removing unnecessary double parentheses
22
--> $DIR/double_parens.rs:15:5
33
|
44
LL | ((0))
55
| ^^^^^
66
|
77
= note: `-D clippy::double-parens` implied by `-D warnings`
88

9-
error: Consider removing unnecessary double parentheses
9+
error: consider removing unnecessary double parentheses
1010
--> $DIR/double_parens.rs:19:14
1111
|
1212
LL | dummy_fn((0));
1313
| ^^^
1414

15-
error: Consider removing unnecessary double parentheses
15+
error: consider removing unnecessary double parentheses
1616
--> $DIR/double_parens.rs:23:20
1717
|
1818
LL | x.dummy_method((0));
1919
| ^^^
2020

21-
error: Consider removing unnecessary double parentheses
21+
error: consider removing unnecessary double parentheses
2222
--> $DIR/double_parens.rs:27:5
2323
|
2424
LL | ((1, 2))
2525
| ^^^^^^^^
2626

27-
error: Consider removing unnecessary double parentheses
27+
error: consider removing unnecessary double parentheses
2828
--> $DIR/double_parens.rs:31:5
2929
|
3030
LL | (())
3131
| ^^^^
3232

33-
error: Consider removing unnecessary double parentheses
33+
error: consider removing unnecessary double parentheses
3434
--> $DIR/double_parens.rs:53:16
3535
|
3636
LL | assert_eq!(((1, 2)), (1, 2), "Error");

0 commit comments

Comments
 (0)