rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More if_chain

Browse Source
This commit is contained in:
Josh Holmer
2018-09-03 23:58:10 -04:00
parent 48e6be42d7
commit ed9cd1530d
1 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
clippy_lints/src/loops.rs
View File

@@ -2271,56 +2271,54 @@ impl<'a, 'tcx> Visitor<'tcx> for VarCollectorVisitor<'a, 'tcx> {
const NEEDLESS_COLLECT_MSG: &str = "avoid using `collect()` when not needed"; const NEEDLESS_COLLECT_MSG: &str = "avoid using `collect()` when not needed";
fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr, cx: &LateContext<'a, 'tcx>) { fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr, cx: &LateContext<'a, 'tcx>) {
if let ExprKind::MethodCall(ref method, _, ref args) = expr.node { if_chain! {
if let ExprKind::MethodCall(ref chain_method, _, _) = args[0].node { if let ExprKind::MethodCall(ref method, _, ref args) = expr.node;
if chain_method.ident.name == "collect" && if let ExprKind::MethodCall(ref chain_method, _, _) = args[0].node;
match_trait_method(cx, &args[0], &paths::ITERATOR) && if chain_method.ident.name == "collect" && match_trait_method(cx, &args[0], &paths::ITERATOR);
chain_method.args.is_some() { if let Some(ref generic_args) = chain_method.args;
let generic_args = chain_method.args.as_ref().unwrap(); if let Some(GenericArg::Type(ref ty)) = generic_args.args.get(0);
if let Some(GenericArg::Type(ref ty)) = generic_args.args.get(0) { then {
let ty = cx.tables.node_id_to_type(ty.hir_id); let ty = cx.tables.node_id_to_type(ty.hir_id);
if match_type(cx, ty, &paths::VEC) || if match_type(cx, ty, &paths::VEC) ||
match_type(cx, ty, &paths::VEC_DEQUE) || match_type(cx, ty, &paths::VEC_DEQUE) ||
match_type(cx, ty, &paths::BTREEMAP) || match_type(cx, ty, &paths::BTREEMAP) ||
match_type(cx, ty, &paths::HASHMAP) { match_type(cx, ty, &paths::HASHMAP) {
if method.ident.name == "len" { if method.ident.name == "len" {
let span = shorten_needless_collect_span(expr); let span = shorten_needless_collect_span(expr);
span_lint_and_then(cx, NEEDLESS_COLLECT, span, NEEDLESS_COLLECT_MSG, |db| { span_lint_and_then(cx, NEEDLESS_COLLECT, span, NEEDLESS_COLLECT_MSG, |db| {
db.span_suggestion_with_applicability( db.span_suggestion_with_applicability(
span, span,
"replace with", "replace with",
".count()".to_string(), ".count()".to_string(),
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
}); });
} }
if method.ident.name == "is_empty" { if method.ident.name == "is_empty" {
let span = shorten_needless_collect_span(expr); let span = shorten_needless_collect_span(expr);
span_lint_and_then(cx, NEEDLESS_COLLECT, span, NEEDLESS_COLLECT_MSG, |db| { span_lint_and_then(cx, NEEDLESS_COLLECT, span, NEEDLESS_COLLECT_MSG, |db| {
db.span_suggestion_with_applicability( db.span_suggestion_with_applicability(
span, span,
"replace with", "replace with",
".next().is_none()".to_string(), ".next().is_none()".to_string(),
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
}); });
} }
if method.ident.name == "contains" { if method.ident.name == "contains" {
let contains_arg = snippet(cx, args[1].span, "??"); let contains_arg = snippet(cx, args[1].span, "??");
let span = shorten_needless_collect_span(expr); let span = shorten_needless_collect_span(expr);
span_lint_and_then(cx, NEEDLESS_COLLECT, span, NEEDLESS_COLLECT_MSG, |db| { span_lint_and_then(cx, NEEDLESS_COLLECT, span, NEEDLESS_COLLECT_MSG, |db| {
db.span_suggestion_with_applicability( db.span_suggestion_with_applicability(
span, span,
"replace with", "replace with",
format!( format!(
".any(|&x| x == {})", ".any(|&x| x == {})",
if contains_arg.starts_with('&') { &contains_arg[1..] } else { &contains_arg } if contains_arg.starts_with('&') { &contains_arg[1..] } else { &contains_arg }
), ),
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
}); });
}
}
} }
} }
} }