2018-11-27 20:14:15 +00:00
|
|
|
use if_chain::if_chain;
|
2019-12-03 23:16:03 +00:00
|
|
|
use rustc::declare_lint_pass;
|
2018-12-29 15:04:45 +00:00
|
|
|
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
|
|
|
|
use rustc_errors::Applicability;
|
2020-01-06 16:39:50 +00:00
|
|
|
use rustc_hir::*;
|
2019-12-03 23:16:03 +00:00
|
|
|
use rustc_session::declare_tool_lint;
|
2020-01-04 10:00:00 +00:00
|
|
|
use rustc_span::source_map::Spanned;
|
2018-12-29 15:04:45 +00:00
|
|
|
use syntax::ast::RangeLimits;
|
2015-08-15 16:55:25 +00:00
|
|
|
|
2019-01-31 01:15:29 +00:00
|
|
|
use crate::utils::sugg::Sugg;
|
2019-12-18 16:59:43 +00:00
|
|
|
use crate::utils::{higher, SpanlessEq};
|
|
|
|
use crate::utils::{is_integer_const, snippet, snippet_opt, span_lint, span_lint_and_then};
|
2017-06-18 13:14:46 +00:00
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 16:50:33 +00:00
|
|
|
/// **What it does:** Checks for zipping a collection with the range of
|
|
|
|
/// `0.._.len()`.
|
|
|
|
///
|
|
|
|
/// **Why is this bad?** The code is better expressed with `.enumerate()`.
|
|
|
|
///
|
|
|
|
/// **Known problems:** None.
|
|
|
|
///
|
|
|
|
/// **Example:**
|
|
|
|
/// ```rust
|
2019-08-02 06:13:54 +00:00
|
|
|
/// # let x = vec![1];
|
|
|
|
/// x.iter().zip(0..x.len());
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```
|
2019-08-20 14:55:17 +00:00
|
|
|
/// Could be written as
|
|
|
|
/// ```rust
|
|
|
|
/// # let x = vec![1];
|
|
|
|
/// x.iter().enumerate();
|
|
|
|
/// ```
|
2016-08-06 08:18:36 +00:00
|
|
|
pub RANGE_ZIP_WITH_LEN,
|
2018-03-28 13:24:26 +00:00
|
|
|
complexity,
|
2016-08-06 08:18:36 +00:00
|
|
|
"zipping iterator with a range when `enumerate()` would do"
|
2015-11-03 14:42:52 +00:00
|
|
|
}
|
2015-08-15 16:55:25 +00:00
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 16:50:33 +00:00
|
|
|
/// **What it does:** Checks for exclusive ranges where 1 is added to the
|
2019-01-31 01:15:29 +00:00
|
|
|
/// upper bound, e.g., `x..(y+1)`.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
|
|
|
/// **Why is this bad?** The code is more readable with an inclusive range
|
|
|
|
/// like `x..=y`.
|
|
|
|
///
|
|
|
|
/// **Known problems:** Will add unnecessary pair of parentheses when the
|
|
|
|
/// expression is not wrapped in a pair but starts with a opening parenthesis
|
|
|
|
/// and ends with a closing one.
|
2019-01-31 01:15:29 +00:00
|
|
|
/// I.e., `let _ = (f()+1)..(f()+1)` results in `let _ = ((f()+1)..=f())`.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
|
|
|
/// **Example:**
|
2019-08-02 06:13:54 +00:00
|
|
|
/// ```rust,ignore
|
2019-03-05 16:50:33 +00:00
|
|
|
/// for x..(y+1) { .. }
|
|
|
|
/// ```
|
2019-08-20 14:55:17 +00:00
|
|
|
/// Could be written as
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// for x..=y { .. }
|
|
|
|
/// ```
|
2017-10-07 14:56:45 +00:00
|
|
|
pub RANGE_PLUS_ONE,
|
2018-08-26 08:57:04 +00:00
|
|
|
complexity,
|
2017-10-07 14:56:45 +00:00
|
|
|
"`x..(y+1)` reads better as `x..=y`"
|
|
|
|
}
|
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 16:50:33 +00:00
|
|
|
/// **What it does:** Checks for inclusive ranges where 1 is subtracted from
|
2019-01-31 01:15:29 +00:00
|
|
|
/// the upper bound, e.g., `x..=(y-1)`.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
|
|
|
/// **Why is this bad?** The code is more readable with an exclusive range
|
|
|
|
/// like `x..y`.
|
|
|
|
///
|
|
|
|
/// **Known problems:** None.
|
|
|
|
///
|
|
|
|
/// **Example:**
|
2019-08-02 06:13:54 +00:00
|
|
|
/// ```rust,ignore
|
2019-03-05 16:50:33 +00:00
|
|
|
/// for x..=(y-1) { .. }
|
|
|
|
/// ```
|
2019-08-20 14:55:17 +00:00
|
|
|
/// Could be written as
|
|
|
|
/// ```rust,ignore
|
|
|
|
/// for x..y { .. }
|
|
|
|
/// ```
|
2017-10-07 14:56:45 +00:00
|
|
|
pub RANGE_MINUS_ONE,
|
2018-08-26 08:57:04 +00:00
|
|
|
complexity,
|
2017-10-07 14:56:45 +00:00
|
|
|
"`x..=(y-1)` reads better as `x..y`"
|
|
|
|
}
|
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
declare_lint_pass!(Ranges => [
|
|
|
|
RANGE_ZIP_WITH_LEN,
|
|
|
|
RANGE_PLUS_ONE,
|
|
|
|
RANGE_MINUS_ONE
|
|
|
|
]);
|
2015-08-15 16:55:25 +00:00
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Ranges {
|
2019-12-27 07:12:26 +00:00
|
|
|
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_>) {
|
2019-09-27 15:16:06 +00:00
|
|
|
if let ExprKind::MethodCall(ref path, _, ref args) = expr.kind {
|
2018-06-28 13:46:58 +00:00
|
|
|
let name = path.ident.as_str();
|
2019-12-18 16:59:43 +00:00
|
|
|
if name == "zip" && args.len() == 2 {
|
2019-09-27 15:16:06 +00:00
|
|
|
let iter = &args[0].kind;
|
2016-03-07 15:31:38 +00:00
|
|
|
let zip_arg = &args[1];
|
2017-10-23 19:18:02 +00:00
|
|
|
if_chain! {
|
2019-01-31 01:15:29 +00:00
|
|
|
// `.iter()` call
|
2018-07-12 07:30:57 +00:00
|
|
|
if let ExprKind::MethodCall(ref iter_path, _, ref iter_args ) = *iter;
|
2019-05-17 21:53:54 +00:00
|
|
|
if iter_path.ident.name == sym!(iter);
|
2019-01-31 01:15:29 +00:00
|
|
|
// range expression in `.zip()` call: `0..x.len()`
|
2018-05-08 15:16:01 +00:00
|
|
|
if let Some(higher::Range { start: Some(start), end: Some(end), .. }) = higher::range(cx, zip_arg);
|
2019-09-09 15:01:01 +00:00
|
|
|
if is_integer_const(cx, start, 0);
|
2019-01-31 01:15:29 +00:00
|
|
|
// `.len()` call
|
2019-09-27 15:16:06 +00:00
|
|
|
if let ExprKind::MethodCall(ref len_path, _, ref len_args) = end.kind;
|
2019-05-17 21:53:54 +00:00
|
|
|
if len_path.ident.name == sym!(len) && len_args.len() == 1;
|
2019-01-31 01:15:29 +00:00
|
|
|
// `.iter()` and `.len()` called on same `Path`
|
2019-09-27 15:16:06 +00:00
|
|
|
if let ExprKind::Path(QPath::Resolved(_, ref iter_path)) = iter_args[0].kind;
|
|
|
|
if let ExprKind::Path(QPath::Resolved(_, ref len_path)) = len_args[0].kind;
|
2018-07-14 22:00:27 +00:00
|
|
|
if SpanlessEq::new(cx).eq_path_segments(&iter_path.segments, &len_path.segments);
|
2017-10-23 19:18:02 +00:00
|
|
|
then {
|
|
|
|
span_lint(cx,
|
|
|
|
RANGE_ZIP_WITH_LEN,
|
|
|
|
expr.span,
|
|
|
|
&format!("It is more idiomatic to use {}.iter().enumerate()",
|
|
|
|
snippet(cx, iter_args[0].span, "_")));
|
|
|
|
}
|
|
|
|
}
|
2015-11-03 14:42:52 +00:00
|
|
|
}
|
2015-08-15 16:55:25 +00:00
|
|
|
}
|
2017-10-07 14:56:45 +00:00
|
|
|
|
2019-09-03 04:26:49 +00:00
|
|
|
check_exclusive_range_plus_one(cx, expr);
|
|
|
|
check_inclusive_range_minus_one(cx, expr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// exclusive range plus one: `x..(y+1)`
|
2019-12-27 07:12:26 +00:00
|
|
|
fn check_exclusive_range_plus_one(cx: &LateContext<'_, '_>, expr: &Expr<'_>) {
|
2019-09-03 04:26:49 +00:00
|
|
|
if_chain! {
|
|
|
|
if let Some(higher::Range {
|
|
|
|
start,
|
|
|
|
end: Some(end),
|
|
|
|
limits: RangeLimits::HalfOpen
|
|
|
|
}) = higher::range(cx, expr);
|
2019-09-09 15:01:01 +00:00
|
|
|
if let Some(y) = y_plus_one(cx, end);
|
2019-09-03 04:26:49 +00:00
|
|
|
then {
|
|
|
|
let span = if expr.span.from_expansion() {
|
|
|
|
expr.span
|
|
|
|
.ctxt()
|
|
|
|
.outer_expn_data()
|
|
|
|
.call_site
|
|
|
|
} else {
|
|
|
|
expr.span
|
|
|
|
};
|
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
RANGE_PLUS_ONE,
|
|
|
|
span,
|
|
|
|
"an inclusive range would be more readable",
|
|
|
|
|db| {
|
|
|
|
let start = start.map_or(String::new(), |x| Sugg::hir(cx, x, "x").to_string());
|
|
|
|
let end = Sugg::hir(cx, y, "y");
|
|
|
|
if let Some(is_wrapped) = &snippet_opt(cx, span) {
|
|
|
|
if is_wrapped.starts_with('(') && is_wrapped.ends_with(')') {
|
|
|
|
db.span_suggestion(
|
|
|
|
span,
|
|
|
|
"use",
|
|
|
|
format!("({}..={})", start, end),
|
|
|
|
Applicability::MaybeIncorrect,
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
db.span_suggestion(
|
|
|
|
span,
|
|
|
|
"use",
|
|
|
|
format!("{}..={}", start, end),
|
|
|
|
Applicability::MachineApplicable, // snippet
|
|
|
|
);
|
2018-08-30 17:06:13 +00:00
|
|
|
}
|
2019-09-03 04:26:49 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
);
|
2017-10-23 19:18:02 +00:00
|
|
|
}
|
2019-09-03 04:26:49 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-07 14:56:45 +00:00
|
|
|
|
2019-09-03 04:26:49 +00:00
|
|
|
// inclusive range minus one: `x..=(y-1)`
|
2019-12-27 07:12:26 +00:00
|
|
|
fn check_inclusive_range_minus_one(cx: &LateContext<'_, '_>, expr: &Expr<'_>) {
|
2019-09-03 04:26:49 +00:00
|
|
|
if_chain! {
|
|
|
|
if let Some(higher::Range { start, end: Some(end), limits: RangeLimits::Closed }) = higher::range(cx, expr);
|
2019-09-09 15:01:01 +00:00
|
|
|
if let Some(y) = y_minus_one(cx, end);
|
2019-09-03 04:26:49 +00:00
|
|
|
then {
|
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
RANGE_MINUS_ONE,
|
|
|
|
expr.span,
|
|
|
|
"an exclusive range would be more readable",
|
|
|
|
|db| {
|
|
|
|
let start = start.map_or(String::new(), |x| Sugg::hir(cx, x, "x").to_string());
|
|
|
|
let end = Sugg::hir(cx, y, "y");
|
|
|
|
db.span_suggestion(
|
|
|
|
expr.span,
|
|
|
|
"use",
|
|
|
|
format!("{}..{}", start, end),
|
|
|
|
Applicability::MachineApplicable, // snippet
|
|
|
|
);
|
|
|
|
},
|
|
|
|
);
|
2017-10-23 19:18:02 +00:00
|
|
|
}
|
2015-08-15 16:55:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-27 07:12:26 +00:00
|
|
|
fn y_plus_one<'t>(cx: &LateContext<'_, '_>, expr: &'t Expr<'_>) -> Option<&'t Expr<'t>> {
|
2019-09-27 15:16:06 +00:00
|
|
|
match expr.kind {
|
2018-11-27 20:14:15 +00:00
|
|
|
ExprKind::Binary(
|
|
|
|
Spanned {
|
|
|
|
node: BinOpKind::Add, ..
|
|
|
|
},
|
|
|
|
ref lhs,
|
|
|
|
ref rhs,
|
|
|
|
) => {
|
2019-09-09 15:01:01 +00:00
|
|
|
if is_integer_const(cx, lhs, 1) {
|
2018-11-27 20:14:15 +00:00
|
|
|
Some(rhs)
|
2019-09-09 15:01:01 +00:00
|
|
|
} else if is_integer_const(cx, rhs, 1) {
|
2018-11-27 20:14:15 +00:00
|
|
|
Some(lhs)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2017-10-07 14:56:45 +00:00
|
|
|
},
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-27 07:12:26 +00:00
|
|
|
fn y_minus_one<'t>(cx: &LateContext<'_, '_>, expr: &'t Expr<'_>) -> Option<&'t Expr<'t>> {
|
2019-09-27 15:16:06 +00:00
|
|
|
match expr.kind {
|
2018-11-27 20:14:15 +00:00
|
|
|
ExprKind::Binary(
|
|
|
|
Spanned {
|
|
|
|
node: BinOpKind::Sub, ..
|
|
|
|
},
|
|
|
|
ref lhs,
|
|
|
|
ref rhs,
|
2019-09-09 15:01:01 +00:00
|
|
|
) if is_integer_const(cx, rhs, 1) => Some(lhs),
|
2017-10-07 14:56:45 +00:00
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|