2018-01-30 01:35:35 +00:00
|
|
|
//! Lint on unnecessary double comparisons. Some examples:
|
|
|
|
|
2021-03-16 00:55:45 +00:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
2021-03-16 16:06:34 +00:00
|
|
|
use clippy_utils::eq_expr_value;
|
2021-03-14 23:17:44 +00:00
|
|
|
use clippy_utils::source::snippet_with_applicability;
|
2018-12-29 15:04:45 +00:00
|
|
|
use rustc_errors::Applicability;
|
2020-02-21 08:39:38 +00:00
|
|
|
use rustc_hir::{BinOpKind, Expr, ExprKind};
|
2020-01-12 06:08:41 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-01-11 11:37:08 +00:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-01-04 10:00:00 +00:00
|
|
|
use rustc_span::source_map::Span;
|
2018-01-30 01:35:35 +00:00
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for double comparisons that could be simplified to a single expression.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
|
|
|
///
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Readability.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-02 18:37:11 +00:00
|
|
|
/// ### Example
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```rust
|
2019-08-02 06:13:54 +00:00
|
|
|
/// # let x = 1;
|
|
|
|
/// # let y = 2;
|
|
|
|
/// if x == y || x < y {}
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// Could be written as:
|
|
|
|
///
|
|
|
|
/// ```rust
|
2019-08-02 06:13:54 +00:00
|
|
|
/// # let x = 1;
|
|
|
|
/// # let y = 2;
|
|
|
|
/// if x <= y {}
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2018-01-30 01:35:35 +00:00
|
|
|
pub DOUBLE_COMPARISONS,
|
2018-03-28 13:24:26 +00:00
|
|
|
complexity,
|
2018-01-30 01:35:35 +00:00
|
|
|
"unnecessary double comparisons that can be simplified"
|
|
|
|
}
|
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
declare_lint_pass!(DoubleComparisons => [DOUBLE_COMPARISONS]);
|
2018-01-30 01:35:35 +00:00
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> DoubleComparisons {
|
2018-10-11 22:18:58 +00:00
|
|
|
#[allow(clippy::similar_names)]
|
2020-06-25 20:41:36 +00:00
|
|
|
fn check_binop(cx: &LateContext<'tcx>, op: BinOpKind, lhs: &'tcx Expr<'_>, rhs: &'tcx Expr<'_>, span: Span) {
|
2019-09-27 15:16:06 +00:00
|
|
|
let (lkind, llhs, lrhs, rkind, rlhs, rrhs) = match (&lhs.kind, &rhs.kind) {
|
2018-07-12 07:30:57 +00:00
|
|
|
(ExprKind::Binary(lb, llhs, lrhs), ExprKind::Binary(rb, rlhs, rrhs)) => {
|
2018-01-30 01:35:35 +00:00
|
|
|
(lb.node, llhs, lrhs, rb.node, rlhs, rrhs)
|
2018-11-27 20:14:15 +00:00
|
|
|
},
|
2018-01-30 01:35:35 +00:00
|
|
|
_ => return,
|
|
|
|
};
|
2021-04-02 21:35:32 +00:00
|
|
|
if !(eq_expr_value(cx, llhs, rlhs) && eq_expr_value(cx, lrhs, rrhs)) {
|
2018-01-30 01:35:35 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
macro_rules! lint_double_comparison {
|
|
|
|
($op:tt) => {{
|
2018-11-27 14:13:57 +00:00
|
|
|
let mut applicability = Applicability::MachineApplicable;
|
|
|
|
let lhs_str = snippet_with_applicability(cx, llhs.span, "", &mut applicability);
|
|
|
|
let rhs_str = snippet_with_applicability(cx, lrhs.span, "", &mut applicability);
|
2018-01-30 01:35:35 +00:00
|
|
|
let sugg = format!("{} {} {}", lhs_str, stringify!($op), rhs_str);
|
2018-11-20 13:06:29 +00:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
DOUBLE_COMPARISONS,
|
|
|
|
span,
|
2020-07-23 17:50:28 +00:00
|
|
|
"this binary expression can be simplified",
|
2018-11-20 13:06:29 +00:00
|
|
|
"try",
|
|
|
|
sugg,
|
2018-11-27 14:13:57 +00:00
|
|
|
applicability,
|
2018-11-20 13:06:29 +00:00
|
|
|
);
|
2018-11-27 20:14:15 +00:00
|
|
|
}};
|
2018-01-30 01:35:35 +00:00
|
|
|
}
|
2019-07-18 15:23:22 +00:00
|
|
|
#[rustfmt::skip]
|
2018-01-30 01:35:35 +00:00
|
|
|
match (op, lkind, rkind) {
|
2018-11-27 20:14:15 +00:00
|
|
|
(BinOpKind::Or, BinOpKind::Eq, BinOpKind::Lt) | (BinOpKind::Or, BinOpKind::Lt, BinOpKind::Eq) => {
|
2021-05-25 00:54:50 +00:00
|
|
|
lint_double_comparison!(<=);
|
2018-11-27 20:14:15 +00:00
|
|
|
},
|
|
|
|
(BinOpKind::Or, BinOpKind::Eq, BinOpKind::Gt) | (BinOpKind::Or, BinOpKind::Gt, BinOpKind::Eq) => {
|
2021-05-25 00:54:50 +00:00
|
|
|
lint_double_comparison!(>=);
|
2018-11-27 20:14:15 +00:00
|
|
|
},
|
|
|
|
(BinOpKind::Or, BinOpKind::Lt, BinOpKind::Gt) | (BinOpKind::Or, BinOpKind::Gt, BinOpKind::Lt) => {
|
2021-05-25 00:54:50 +00:00
|
|
|
lint_double_comparison!(!=);
|
2018-11-27 20:14:15 +00:00
|
|
|
},
|
|
|
|
(BinOpKind::And, BinOpKind::Le, BinOpKind::Ge) | (BinOpKind::And, BinOpKind::Ge, BinOpKind::Le) => {
|
2021-05-25 00:54:50 +00:00
|
|
|
lint_double_comparison!(==);
|
2018-11-27 20:14:15 +00:00
|
|
|
},
|
2018-01-30 01:35:35 +00:00
|
|
|
_ => (),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for DoubleComparisons {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
|
2021-04-02 21:35:32 +00:00
|
|
|
if let ExprKind::Binary(ref kind, lhs, rhs) = expr.kind {
|
2019-10-03 19:09:32 +00:00
|
|
|
Self::check_binop(cx, kind.node, lhs, rhs, expr.span);
|
2018-01-30 01:35:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|