user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only suggest .copied() for Option right now

Browse source
This commit is contained in:
Manish Goregaokar 2019-04-15 14:48:45 -07:00
parent ad2c65bd1b
commit e9cde416ba
4 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
clippy_lints/src/map_clone.rs
View file

@ -1,6 +1,6 @@
use crate::utils::paths;
use crate::utils::{
in_macro, match_trait_method, match_type, remove_blocks, snippet_with_applicability, span_lint_and_sugg, is_copy
in_macro, is_copy, match_trait_method, match_type, remove_blocks, snippet_with_applicability, span_lint_and_sugg,
};
use if_chain::if_chain;
use rustc::hir;
@ -63,7 +63,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
if args.len() == 2;
if method.ident.as_str() == "map";
let ty = cx.tables.expr_ty(&args[0]);
if match_type(cx, ty, &paths::OPTION) || match_trait_method(cx, e, &paths::ITERATOR);
let is_option = match_type(cx, ty, &paths::OPTION);
if is_option || match_trait_method(cx, e, &paths::ITERATOR);
if let hir::ExprKind::Closure(_, _, body_id, _, _) = args[1].node;
let closure_body = cx.tcx.hir().body(body_id);
let closure_expr = remove_blocks(&closure_body.value);
@ -73,14 +74,16 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
hir::BindingAnnotation::Unannotated, .., name, None
) = inner.node {
if ident_eq(name, closure_expr) {
lint(cx, e.span, args[0].span, true);
// FIXME When Iterator::copied() stabilizes we can remove is_option
// from here and the other lint() calls
lint(cx, e.span, args[0].span, is_option);
}
},
hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, .., name, None) => {
match closure_expr.node {
hir::ExprKind::Unary(hir::UnOp::UnDeref, ref inner) => {
if ident_eq(name, inner) && !cx.tables.expr_ty(inner).is_box() {
lint(cx, e.span, args[0].span, true);
lint(cx, e.span, args[0].span, is_option);
}
},
hir::ExprKind::MethodCall(ref method, _, ref obj) => {
@ -90,7 +93,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
let obj_ty = cx.tables.expr_ty(&obj[0]);
if let ty::Ref(_, ty, _) = obj_ty.sty {
let copy = is_copy(cx, ty);
lint(cx, e.span, args[0].span, copy);
lint(cx, e.span, args[0].span, is_option && copy);
} else {
lint_needless_cloning(cx, e.span, args[0].span);
}