refactor

Author: lengyijun

clippy_lints/src/same_name_method.rs

@@ -4,7 +4,7 @@ use rustc_hir::def::{DefKind, Res};
 use rustc_hir::{Crate, Impl, ItemKind, Node, Path, QPath, TraitRef, TyKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty::AssocKind;
-use rustc_session::{declare_tool_lint, declare_lint_pass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
 use rustc_span::symbol::SymbolStr;
 use rustc_span::Span;
 use std::collections::{BTreeMap, BTreeSet};
@@ -98,9 +98,12 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
                                         cx,
                                         SAME_NAME_METHOD,
                                         *impl_span,
-                                        "binding's name is same to an existing binding",
+                                        "method's name is same to an existing method in a trait",
                                         |diag| {
-                                            diag.span_note(trait_method_span, "existing binding defined here");
+                                            diag.span_note(
+                                                trait_method_span,
+                                                &format!("existing `{}` defined here", method_name),
+                                            );
                                         },
                                     );
                                 }
@@ -119,9 +122,8 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
                                 check_trait_method(method_name, impl_item_ref.span);
                             }
 
-                            let trait_span = item.span;
                             for method_name in methods_in_trait {
-                                check_trait_method(method_name, trait_span);
+                                check_trait_method(method_name, item.span);
                             }
                         },
                         None => {
@@ -135,11 +137,14 @@ impl<'tcx> LateLintPass<'tcx> for SameNameMethod {
                                         cx,
                                         SAME_NAME_METHOD,
                                         impl_span,
-                                        "binding's name is same to an existing binding",
+                                        "method's name is same to an existing method in a trait",
                                         |diag| {
                                             // TODO should we `span_note` on every trait?
                                             // iterate on trait_spans?
-                                            diag.span_note(trait_spans[0], "existing binding defined here");
+                                            diag.span_note(
+                                                trait_spans[0],
+                                                &format!("existing `{}` defined here", method_name),
+                                            );
                                         },
                                     );
                                 }

tests/ui/same_name_method.stderr

@@ -1,59 +1,59 @@
-error: binding's name is same to an existing binding
+error: method's name is same to an existing method in a trait
   --> $DIR/same_name_method.rs:19:13
    |
 LL |             fn foo() {}
    |             ^^^^^^^^^^^
    |
    = note: `-D clippy::same-name-method` implied by `-D warnings`
-note: existing binding defined here
+note: existing `foo` defined here
   --> $DIR/same_name_method.rs:23:13
    |
 LL |             fn foo() {}
    |             ^^^^^^^^^^^
 
-error: binding's name is same to an existing binding
+error: method's name is same to an existing method in a trait
   --> $DIR/same_name_method.rs:43:13
    |
 LL |             fn foo() {}
    |             ^^^^^^^^^^^
    |
-note: existing binding defined here
+note: existing `foo` defined here
   --> $DIR/same_name_method.rs:47:13
    |
 LL |             fn foo() {}
    |             ^^^^^^^^^^^
 
-error: binding's name is same to an existing binding
+error: method's name is same to an existing method in a trait
   --> $DIR/same_name_method.rs:57:13
    |
 LL |             fn foo() {}
    |             ^^^^^^^^^^^
    |
-note: existing binding defined here
+note: existing `foo` defined here
   --> $DIR/same_name_method.rs:60:9
    |
 LL |         impl T1 for S {}
    |         ^^^^^^^^^^^^^^^^
 
-error: binding's name is same to an existing binding
+error: method's name is same to an existing method in a trait
   --> $DIR/same_name_method.rs:69:13
    |
 LL |             fn foo() {}
    |             ^^^^^^^^^^^
    |
-note: existing binding defined here
+note: existing `foo` defined here
   --> $DIR/same_name_method.rs:72:9
    |
 LL |         impl T1 for S {}
    |         ^^^^^^^^^^^^^^^^
 
-error: binding's name is same to an existing binding
+error: method's name is same to an existing method in a trait
   --> $DIR/same_name_method.rs:33:13
    |
 LL |             fn clone() {}
    |             ^^^^^^^^^^^^^
    |
-note: existing binding defined here
+note: existing `clone` defined here
   --> $DIR/same_name_method.rs:29:18
    |
 LL |         #[derive(Clone)]