Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct false positive in wrong_self_convention lint for to_mut

Browse source
This commit is contained in:
Josh Mcguigan 2018-10-01 04:47:06 -07:00
parent 5f9af5f69c
commit f142098474
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clippy_lints/src/methods/mod.rs
View file

@ -882,12 +882,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
let ty = cx.tcx.type_of(def_id); let ty = cx.tcx.type_of(def_id);
let is_copy = is_copy(cx, ty); let is_copy = is_copy(cx, ty);
for &(ref conv, self_kinds) in &CONVENTIONS { for &(ref conv, self_kinds) in &CONVENTIONS {
if_chain! { if conv.check(&name.as_str()) {
if conv.check(&name.as_str());
if !self_kinds if !self_kinds
.iter() .iter()
.any(|k| k.matches(cx, first_arg_ty, first_arg, self_ty, is_copy, &implitem.generics)); .any(|k| k.matches(cx, first_arg_ty, first_arg, self_ty, is_copy, &implitem.generics)) {
then {
let lint = if item.vis.node.is_pub() { let lint = if item.vis.node.is_pub() {
WRONG_PUB_SELF_CONVENTION WRONG_PUB_SELF_CONVENTION
} else { } else {
@ -904,6 +902,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(" or "))); .join(" or ")));
} }
// Only check the first convention to match (CONVENTIONS should be listed from most to least specific)
break;
} }
} }
@ -1183,8 +1184,8 @@ fn lint_clone_on_copy(cx: &LateContext<'_, '_>, expr: &hir::Expr, arg: &hir::Exp
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
db.span_suggestion_with_applicability( db.span_suggestion_with_applicability(
expr.span, expr.span,
"or try being explicit about what type to clone", "or try being explicit about what type to clone",
explicit, explicit,
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
@ -2067,12 +2068,13 @@ enum Convention {
} }
#[rustfmt::skip] #[rustfmt::skip]
const CONVENTIONS: [(Convention, &[SelfKind]); 6] = [ const CONVENTIONS: [(Convention, &[SelfKind]); 7] = [
(Convention::Eq("new"), &[SelfKind::No]), (Convention::Eq("new"), &[SelfKind::No]),
(Convention::StartsWith("as_"), &[SelfKind::Ref, SelfKind::RefMut]), (Convention::StartsWith("as_"), &[SelfKind::Ref, SelfKind::RefMut]),
(Convention::StartsWith("from_"), &[SelfKind::No]), (Convention::StartsWith("from_"), &[SelfKind::No]),
(Convention::StartsWith("into_"), &[SelfKind::Value]), (Convention::StartsWith("into_"), &[SelfKind::Value]),
(Convention::StartsWith("is_"), &[SelfKind::Ref, SelfKind::No]), (Convention::StartsWith("is_"), &[SelfKind::Ref, SelfKind::No]),
(Convention::Eq("to_mut"), &[SelfKind::RefMut]),
(Convention::StartsWith("to_"), &[SelfKind::Ref]), (Convention::StartsWith("to_"), &[SelfKind::Ref]),
]; ];

1
tests/ui/wrong_self_convention.rs
View file

@ -59,4 +59,5 @@ impl Bar {
fn is_(self) {} fn is_(self) {}
fn to_(self) {} fn to_(self) {}
fn from_(self) {} fn from_(self) {}
fn to_mut(&mut self) {}
} }