diff options
| -rw-r--r-- | clippy_lints/src/methods/map_clone.rs | 14 | ||||
| -rw-r--r-- | clippy_lints/src/methods/useless_asref.rs | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/clippy_lints/src/methods/map_clone.rs b/clippy_lints/src/methods/map_clone.rs index 19eea00d545..f9f636bbbf7 100644 --- a/clippy_lints/src/methods/map_clone.rs +++ b/clippy_lints/src/methods/map_clone.rs @@ -15,14 +15,20 @@ use rustc_span::{sym, Span}; use super::MAP_CLONE; +// If this `map` is called on an `Option` or a `Result` and the previous call is `as_ref`, we don't +// run this lint because it would overlap with `useless_asref` which provides a better suggestion +// in this case. fn should_run_lint(cx: &LateContext<'_>, e: &hir::Expr<'_>, method_id: DefId) -> bool { if is_diag_trait_item(cx, method_id, sym::Iterator) { return true; } - if !cx.tcx.impl_of_method(method_id).map_or(false, |id| { + // We check if it's an `Option` or a `Result`. + if let Some(id) = cx.tcx.impl_of_method(method_id) { let identity = cx.tcx.type_of(id).instantiate_identity(); - is_type_diagnostic_item(cx, identity, sym::Option) || is_type_diagnostic_item(cx, identity, sym::Result) - }) { + if !is_type_diagnostic_item(cx, identity, sym::Option) && !is_type_diagnostic_item(cx, identity, sym::Result) { + return false; + } + } else { return false; } // We check if the previous method call is `as_ref`. @@ -32,7 +38,7 @@ fn should_run_lint(cx: &LateContext<'_>, e: &hir::Expr<'_>, method_id: DefId) -> return path2.ident.name != sym::as_ref || path1.ident.name != sym::map; } - return true; + true } pub(super) fn check(cx: &LateContext<'_>, e: &hir::Expr<'_>, recv: &hir::Expr<'_>, arg: &hir::Expr<'_>, msrv: &Msrv) { diff --git a/clippy_lints/src/methods/useless_asref.rs b/clippy_lints/src/methods/useless_asref.rs index c15ca40e8d8..66727e5a29d 100644 --- a/clippy_lints/src/methods/useless_asref.rs +++ b/clippy_lints/src/methods/useless_asref.rs @@ -90,10 +90,9 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, call_name: &str, && segment.ident.name == sym::map // And that it only has one argument. && let [arg] = args + && is_calling_clone(cx, arg) { - if is_calling_clone(cx, arg) { - lint_as_ref_clone(cx, expr.span.with_hi(parent.span.hi()), recvr, call_name); - } + lint_as_ref_clone(cx, expr.span.with_hi(parent.span.hi()), recvr, call_name); } } } |