of_trait first

Author: lengyijun

clippy_lints/src/same_name_method.rs

@@ -65,24 +65,12 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
             }) = &item.kind
             {
                 if let TyKind::Path(QPath::Resolved(_, Path { res, .. })) = self_ty.kind {
-                    for impl_item_ref in (*items)
-                        .iter()
-                        .filter(|impl_item_ref| matches!(impl_item_ref.kind, rustc_hir::AssocItemKind::Fn { .. }))
-                    {
-                        let method_name = impl_item_ref.ident.as_str();
-                        match of_trait {
-                            Some(_trait_ref) => {
-                                // FIXME: try to collect default methods in trait.
-                                // but `rustc_middle::ty::assoc::AssocItems::items` is not public
-                                // if let Some(node)=cx.tcx.hir().find(trait_ref.hir_ref_id){
-                                // if let Node::TraitRef(TraitRef{path,..})=node{
-                                // if let Res::Def(DefKind::Trait,did)=path.res{
-                                // items is private
-                                // cx.tcx.associated_items(did).items.iter().filter(|_k,v|matches!(v,AssocKind::
-                                // Fn)). map(|(k,_v)|k).collect(); }
-                                // }
-                                // }
-
+                    match of_trait {
+                        Some(_trait_ref) => {
+                            for impl_item_ref in (*items).iter().filter(|impl_item_ref| {
+                                matches!(impl_item_ref.kind, rustc_hir::AssocItemKind::Fn { .. })
+                            }) {
+                                let method_name = impl_item_ref.ident.as_str();
                                 let trait_span = impl_item_ref.span;
                                 if let Some(s) = mp.get_mut(res) {
                                     if let Some(impl_span) = s.impl_methods.get(&method_name) {
@@ -110,8 +98,13 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
                                         },
                                     );
                                 }
-                            },
-                            None => {
+                            }
+                        },
+                        None => {
+                            for impl_item_ref in (*items).iter().filter(|impl_item_ref| {
+                                matches!(impl_item_ref.kind, rustc_hir::AssocItemKind::Fn { .. })
+                            }) {
+                                let method_name = impl_item_ref.ident.as_str();
                                 let impl_span = impl_item_ref.span;
                                 if let Some(s) = mp.get_mut(res) {
                                     if let Some(trait_spans) = s.trait_methods.get(&method_name) {
@@ -136,8 +129,8 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
                                         },
                                     );
                                 }
-                            },
-                        }
+                            }
+                        },
                     }
                 }
             }