Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2025-02-18 15:08:47 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clippy_lints/src/loops.rs
View file

@ -2271,13 +2271,13 @@ 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) ||
@ -2323,8 +2323,6 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr, cx: &LateContext<'a, 'tcx>
} }
} }
} }
}
}
} }
fn shorten_needless_collect_span(expr: &Expr) -> Span { fn shorten_needless_collect_span(expr: &Expr) -> Span {