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

better naming, Iterator::eq

Browse source
This commit is contained in:
Andre Bogus 2017-06-07 05:40:57 +02:00
parent 8122d3e8cb
commit a648cfeae1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clippy_lints/src/methods.rs
View file

@ -1386,8 +1386,8 @@ impl SelfKind {
} else { } else {
match self { match self {
SelfKind::Value => false, SelfKind::Value => false,
SelfKind::Ref => is_astrait(ty, self_ty, generics, &paths::ASREF_TRAIT), SelfKind::Ref => is_as_ref_or_mut_trait(ty, self_ty, generics, &paths::ASREF_TRAIT),
SelfKind::RefMut => is_astrait(ty, self_ty, generics, &paths::ASMUT_TRAIT), SelfKind::RefMut => is_as_ref_or_mut_trait(ty, self_ty, generics, &paths::ASMUT_TRAIT),
SelfKind::No => true SelfKind::No => true
} }
} }
@ -1403,7 +1403,7 @@ impl SelfKind {
} }
} }
fn is_astrait(ty: &hir::Ty, self_ty: &hir::Ty, generics: &hir::Generics, name: &[&str]) -> bool { fn is_as_ref_or_mut_trait(ty: &hir::Ty, self_ty: &hir::Ty, generics: &hir::Generics, name: &[&str]) -> bool {
single_segment_ty(ty).map_or(false, |seg| { single_segment_ty(ty).map_or(false, |seg| {
generics.ty_params.iter().any(|param| { generics.ty_params.iter().any(|param| {
param.name == seg.name && param.bounds.iter().any(|bound| { param.name == seg.name && param.bounds.iter().any(|bound| {
@ -1426,9 +1426,10 @@ fn is_astrait(ty: &hir::Ty, self_ty: &hir::Ty, generics: &hir::Generics, name: &
fn is_ty(ty: &hir::Ty, self_ty: &hir::Ty) -> bool { fn is_ty(ty: &hir::Ty, self_ty: &hir::Ty) -> bool {
match (&ty.node, &self_ty.node) { match (&ty.node, &self_ty.node) {
(&hir::TyPath(hir::QPath::Resolved(_, ref ty_path)), &hir::TyPath(hir::QPath::Resolved(_, ref self_ty_path))) => { (&hir::TyPath(hir::QPath::Resolved(_, ref ty_path)),
ty_path.segments.iter().rev().map(|seg| seg.name).zip( &hir::TyPath(hir::QPath::Resolved(_, ref self_ty_path))) => {
self_ty_path.segments.iter().rev().map(|seg| seg.name)).all(|(l, r)| l == r) ty_path.segments.iter().map(|seg| seg.name).eq(
self_ty_path.segments.iter().map(|seg| seg.name))
} }
_ => false _ => false
} }