refactor test

Author: lengyijun

tests/ui/same_name_method.rs

@@ -1,97 +1,109 @@
-#![allow(dead_code)]
+#![allow(dead_code, non_camel_case_types)]
 
-mod test_simple_case {
-    trait T1 {
-        fn foo() {}
-    }
+trait T1 {
+    fn foo() {}
+}
 
-    struct S;
+trait T2 {
+    fn foo() {}
+}
 
-    impl S {
-        fn foo() {}
-    }
+mod should_lint {
 
-    impl T1 for S {
-        fn foo() {}
-    }
-}
+    mod test_basic_case {
+        use crate::T1;
 
-mod test_derive {
-    #[derive(Clone)]
-    struct S;
+        struct S;
 
-    impl S {
-        fn clone() {}
-    }
-}
+        impl S {
+            fn foo() {}
+        }
 
-mod with_generic {
-    trait T1 {
-        fn foo();
+        impl T1 for S {
+            fn foo() {}
+        }
     }
 
-    struct S<U>(U);
+    mod test_derive {
 
-    impl<U> S<U> {
-        fn foo() {}
-    }
+        #[derive(Clone)]
+        struct S;
 
-    impl<U: Copy> T1 for S<U> {
-        fn foo() {}
+        impl S {
+            fn clone() {}
+        }
     }
-}
 
-mod default_method {
-    trait T1 {
-        fn foo() {}
-    }
+    mod with_generic {
+        use crate::T1;
+
+        struct S<U>(U);
 
-    struct S;
+        impl<U> S<U> {
+            fn foo() {}
+        }
 
-    impl S {
-        fn foo() {}
+        impl<U: Copy> T1 for S<U> {
+            fn foo() {}
+        }
     }
 
-    impl T1 for S {}
-}
+    mod default_method {
+        use crate::T1;
 
-mod mulitply_conflicit_trait {
-    trait T1 {
-        fn foo() {}
-    }
+        struct S;
+
+        impl S {
+            fn foo() {}
+        }
 
-    trait T2 {
-        fn foo() {}
+        impl T1 for S {}
     }
 
-    struct S;
+    mod mulitply_conflicit_trait {
+        use crate::{T1, T2};
 
-    impl S {
-        fn foo() {}
-    }
+        struct S;
 
-    impl T1 for S {}
+        impl S {
+            fn foo() {}
+        }
 
-    impl T2 for S {}
-}
+        impl T1 for S {}
 
-mod not_lint_two_trait_method {
-    trait T1 {
-        fn foo();
+        impl T2 for S {}
     }
+}
 
-    trait T2 {
-        fn foo();
-    }
+mod should_not_lint {
+
+    mod not_lint_two_trait_method {
+        use crate::{T1, T2};
+
+        struct S;
 
-    struct S;
+        impl T1 for S {
+            fn foo() {}
+        }
 
-    impl T1 for S {
-        fn foo() {}
+        impl T2 for S {
+            fn foo() {}
+        }
     }
 
-    impl T2 for S {
-        fn foo() {}
+    mod only_lint_on_method {
+        trait T3 {
+            type foo;
+        }
+
+        struct S;
+
+        impl S {
+            fn foo() {}
+        }
+        impl T3 for S {
+            type foo = usize;
+        }
     }
 }
 

tests/ui/same_name_method.stderr

@@ -1,63 +1,63 @@
 error: binding's name is same to an existing binding
-  --> $DIR/same_name_method.rs:11:9
+  --> $DIR/same_name_method.rs:19:13
    |
-LL |         fn foo() {}
-   |         ^^^^^^^^^^^
+LL |             fn foo() {}
+   |             ^^^^^^^^^^^
    |
    = note: `-D clippy::same-name-method` implied by `-D warnings`
 note: existing binding defined here
-  --> $DIR/same_name_method.rs:15:9
+  --> $DIR/same_name_method.rs:23:13
    |
-LL |         fn foo() {}
-   |         ^^^^^^^^^^^
+LL |             fn foo() {}
+   |             ^^^^^^^^^^^
 
 error: binding's name is same to an existing binding
-  --> $DIR/same_name_method.rs:36:9
+  --> $DIR/same_name_method.rs:43:13
    |
-LL |         fn foo() {}
-   |         ^^^^^^^^^^^
+LL |             fn foo() {}
+   |             ^^^^^^^^^^^
    |
 note: existing binding defined here
-  --> $DIR/same_name_method.rs:40:9
+  --> $DIR/same_name_method.rs:47:13
    |
-LL |         fn foo() {}
-   |         ^^^^^^^^^^^
+LL |             fn foo() {}
+   |             ^^^^^^^^^^^
 
 error: binding's name is same to an existing binding
-  --> $DIR/same_name_method.rs:52:9
+  --> $DIR/same_name_method.rs:57:13
    |
-LL |         fn foo() {}
-   |         ^^^^^^^^^^^
+LL |             fn foo() {}
+   |             ^^^^^^^^^^^
    |
 note: existing binding defined here
-  --> $DIR/same_name_method.rs:55:5
+  --> $DIR/same_name_method.rs:60:9
    |
-LL |     impl T1 for S {}
-   |     ^^^^^^^^^^^^^^^^
+LL |         impl T1 for S {}
+   |         ^^^^^^^^^^^^^^^^
 
 error: binding's name is same to an existing binding
-  --> $DIR/same_name_method.rs:70:9
+  --> $DIR/same_name_method.rs:69:13
    |
-LL |         fn foo() {}
-   |         ^^^^^^^^^^^
+LL |             fn foo() {}
+   |             ^^^^^^^^^^^
    |
 note: existing binding defined here
-  --> $DIR/same_name_method.rs:73:5
+  --> $DIR/same_name_method.rs:72:9
    |
-LL |     impl T1 for S {}
-   |     ^^^^^^^^^^^^^^^^
+LL |         impl T1 for S {}
+   |         ^^^^^^^^^^^^^^^^
 
 error: binding's name is same to an existing binding
-  --> $DIR/same_name_method.rs:24:9
+  --> $DIR/same_name_method.rs:33:13
    |
-LL |         fn clone() {}
-   |         ^^^^^^^^^^^^^
+LL |             fn clone() {}
+   |             ^^^^^^^^^^^^^
    |
 note: existing binding defined here
-  --> $DIR/same_name_method.rs:20:14
+  --> $DIR/same_name_method.rs:29:18
    |
-LL |     #[derive(Clone)]
-   |              ^^^^^
+LL |         #[derive(Clone)]
+   |                  ^^^^^
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors