|
1 | 1 | use rustc::lint::*;
|
2 | 2 | use rustc_front::hir::*;
|
3 | 3 | use syntax::codemap::Spanned;
|
4 |
| -use utils::{match_type, is_integer_literal}; |
| 4 | +use utils::{is_integer_literal, match_type, snippet}; |
5 | 5 |
|
6 | 6 | declare_lint! {
|
7 | 7 | pub RANGE_STEP_BY_ZERO, Warn,
|
8 | 8 | "using Range::step_by(0), which produces an infinite iterator"
|
9 | 9 | }
|
| 10 | +declare_lint! { |
| 11 | + pub RANGE_ZIP_WITH_LEN, Warn, |
| 12 | + "zipping iterator with a range when enumerate() would do" |
| 13 | +} |
10 | 14 |
|
11 | 15 | #[derive(Copy,Clone)]
|
12 | 16 | pub struct StepByZero;
|
13 | 17 |
|
14 | 18 | impl LintPass for StepByZero {
|
15 | 19 | fn get_lints(&self) -> LintArray {
|
16 |
| - lint_array!(RANGE_STEP_BY_ZERO) |
| 20 | + lint_array!(RANGE_STEP_BY_ZERO, RANGE_ZIP_WITH_LEN) |
17 | 21 | }
|
18 | 22 | }
|
19 | 23 |
|
20 | 24 | impl LateLintPass for StepByZero {
|
21 | 25 | fn check_expr(&mut self, cx: &LateContext, expr: &Expr) {
|
22 | 26 | if let ExprMethodCall(Spanned { node: ref name, .. }, _,
|
23 | 27 | ref args) = expr.node {
|
24 |
| - // Only warn on literal ranges. |
| 28 | + // Range with step_by(0). |
25 | 29 | if name.as_str() == "step_by" && args.len() == 2 &&
|
26 | 30 | is_range(cx, &args[0]) && is_integer_literal(&args[1], 0) {
|
27 | 31 | cx.span_lint(RANGE_STEP_BY_ZERO, expr.span,
|
28 | 32 | "Range::step_by(0) produces an infinite iterator. \
|
29 | 33 | Consider using `std::iter::repeat()` instead")
|
30 | 34 | }
|
| 35 | + |
| 36 | + // x.iter().zip(0..x.len()) |
| 37 | + else if name.as_str() == "zip" && args.len() == 2 { |
| 38 | + let iter = &args[0].node; |
| 39 | + let zip_arg = &args[1].node; |
| 40 | + if_let_chain! { |
| 41 | + [ |
| 42 | + // .iter() call |
| 43 | + let &ExprMethodCall( Spanned { node: ref iter_name, .. }, _, ref iter_args ) = iter, |
| 44 | + iter_name.as_str() == "iter", |
| 45 | + // range expression in .zip() call: 0..x.len() |
| 46 | + let &ExprRange(Some(ref from), Some(ref to)) = zip_arg, |
| 47 | + is_integer_literal(from, 0), |
| 48 | + // .len() call |
| 49 | + let ExprMethodCall(Spanned { node: ref len_name, .. }, _, ref len_args) = to.node, |
| 50 | + len_name.as_str() == "len" && len_args.len() == 1, |
| 51 | + // .iter() and .len() called on same Path |
| 52 | + let ExprPath(_, Path { segments: ref iter_path, .. }) = iter_args[0].node, |
| 53 | + let ExprPath(_, Path { segments: ref len_path, .. }) = len_args[0].node, |
| 54 | + iter_path == len_path |
| 55 | + ], { |
| 56 | + cx.span_lint(RANGE_ZIP_WITH_LEN, expr.span, |
| 57 | + &format!("It is more idiomatic to use {}.iter().enumerate()", |
| 58 | + snippet(cx, iter_args[0].span, "_"))); |
| 59 | + } |
| 60 | + } |
| 61 | + } |
31 | 62 | }
|
32 | 63 | }
|
33 | 64 | }
|
|
0 commit comments