Move repeated_where_clauses_or_trait_bounds into trait_duplication_in_bounds lint.

Author: Allen Hsu

CHANGELOG.md

@@ -3861,7 +3861,6 @@ Released 2018-09-13
 [`ref_option_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_option_ref
 [`regex_macro`]: https://rust-lang.github.io/rust-clippy/master/index.html#regex_macro
 [`repeat_once`]: https://rust-lang.github.io/rust-clippy/master/index.html#repeat_once
-[`repeated_where_clauses_or_trait_bounds`]: https://rust-lang.github.io/rust-clippy/master/index.html#repeated_where_clauses_or_trait_bounds
 [`replace_consts`]: https://rust-lang.github.io/rust-clippy/master/index.html#replace_consts
 [`rest_pat_in_fully_bound_structs`]: https://rust-lang.github.io/rust-clippy/master/index.html#rest_pat_in_fully_bound_structs
 [`result_expect_used`]: https://rust-lang.github.io/rust-clippy/master/index.html#result_expect_used

clippy_lints/src/lib.register_lints.rs

@@ -516,7 +516,6 @@ store.register_lints(&[
     temporary_assignment::TEMPORARY_ASSIGNMENT,
     to_digit_is_some::TO_DIGIT_IS_SOME,
     trailing_empty_array::TRAILING_EMPTY_ARRAY,
-    trait_bounds::REPEATED_WHERE_CLAUSES_OR_TRAIT_BOUNDS,
     trait_bounds::TRAIT_DUPLICATION_IN_BOUNDS,
     trait_bounds::TYPE_REPETITION_IN_BOUNDS,
     transmute::CROSSPOINTER_TRANSMUTE,

clippy_lints/src/lib.register_pedantic.rs

@@ -86,7 +86,6 @@ store.register_group(true, "clippy::pedantic", Some("clippy_pedantic"), vec![
     LintId::of(semicolon_if_nothing_returned::SEMICOLON_IF_NOTHING_RETURNED),
     LintId::of(stable_sort_primitive::STABLE_SORT_PRIMITIVE),
     LintId::of(strings::STRING_ADD_ASSIGN),
-    LintId::of(trait_bounds::REPEATED_WHERE_CLAUSES_OR_TRAIT_BOUNDS),
     LintId::of(transmute::TRANSMUTE_PTR_TO_PTR),
     LintId::of(types::LINKEDLIST),
     LintId::of(types::OPTION_OPTION),

clippy_lints/src/trait_bounds.rs

@@ -63,20 +63,7 @@ declare_clippy_lint! {
     ///
     /// fn func<T>(arg: T) where T: Clone + Default {}
     /// ```
-    #[clippy::version = "1.47.0"]
-    pub TRAIT_DUPLICATION_IN_BOUNDS,
-    nursery,
-    "check if the same trait bounds are specified twice during a function declaration"
-}
-
-declare_clippy_lint! {
-    /// ### What it does
-    /// Checks for multiple instances of the same where clause or trait bound
     ///
-    /// ### Why is this bad?
-    /// Adds to code noise
-    ///
-    /// ### Example
     /// ```rust
     /// fn foo<T: Default + Default>(bar: T) {}
     /// ```
@@ -92,10 +79,10 @@ declare_clippy_lint! {
     /// ```rust
     /// fn foo<T>(bar: T) where T: Default {}
     /// ```
-    #[clippy::version = "1.62.0"]
-    pub REPEATED_WHERE_CLAUSES_OR_TRAIT_BOUNDS,
-    pedantic,
-    "traits are repeated within trait bounds or where clause"
+    #[clippy::version = "1.47.0"]
+    pub TRAIT_DUPLICATION_IN_BOUNDS,
+    nursery,
+    "check if the same trait bounds are specified twice during a function declaration"
 }
 
 #[derive(Copy, Clone)]
@@ -110,7 +97,7 @@ impl TraitBounds {
     }
 }
 
-impl_lint_pass!(TraitBounds => [TYPE_REPETITION_IN_BOUNDS, TRAIT_DUPLICATION_IN_BOUNDS, REPEATED_WHERE_CLAUSES_OR_TRAIT_BOUNDS]);
+impl_lint_pass!(TraitBounds => [TYPE_REPETITION_IN_BOUNDS, TRAIT_DUPLICATION_IN_BOUNDS]);
 
 impl<'tcx> LateLintPass<'tcx> for TraitBounds {
     fn check_generics(&mut self, cx: &LateContext<'tcx>, gen: &'tcx Generics<'_>) {
@@ -374,7 +361,7 @@ fn rollup_traits(cx: &LateContext<'_>, bounds: &[GenericBound<'_>], msg: &str) {
 
             span_lint_and_sugg(
                 cx,
-                REPEATED_WHERE_CLAUSES_OR_TRAIT_BOUNDS,
+                TRAIT_DUPLICATION_IN_BOUNDS,
                 all_trait_span,
                 msg,
                 "try",

tests/ui/repeated_where_clauses_or_trait_bounds.fixed

@@ -1,7 +1,7 @@
 // run-rustfix
 //
 #![allow(unused)]
-#![deny(clippy::repeated_where_clauses_or_trait_bounds)]
+#![deny(clippy::trait_duplication_in_bounds)]
 
 fn bad_foo<T: Clone + Copy, U: Clone + Copy>(arg0: T, argo1: U) {
     unimplemented!();

tests/ui/repeated_where_clauses_or_trait_bounds.rs

@@ -1,7 +1,7 @@
 // run-rustfix
 //
 #![allow(unused)]
-#![deny(clippy::repeated_where_clauses_or_trait_bounds)]
+#![deny(clippy::trait_duplication_in_bounds)]
 
 fn bad_foo<T: Clone + Clone + Clone + Copy, U: Clone + Copy>(arg0: T, argo1: U) {
     unimplemented!();

tests/ui/repeated_where_clauses_or_trait_bounds.stderr

@@ -1,14 +1,29 @@
-error: these bounds contain repeated elements
+error: this trait bound is already specified in the where clause
   --> $DIR/repeated_where_clauses_or_trait_bounds.rs:6:15
    |
 LL | fn bad_foo<T: Clone + Clone + Clone + Copy, U: Clone + Copy>(arg0: T, argo1: U) {
-   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Clone + Copy`
+   |               ^^^^^
    |
 note: the lint level is defined here
   --> $DIR/repeated_where_clauses_or_trait_bounds.rs:4:9
    |
-LL | #![deny(clippy::repeated_where_clauses_or_trait_bounds)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | #![deny(clippy::trait_duplication_in_bounds)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = help: consider removing this trait bound
+
+error: these bounds contain repeated elements
+  --> $DIR/repeated_where_clauses_or_trait_bounds.rs:6:15
+   |
+LL | fn bad_foo<T: Clone + Clone + Clone + Copy, U: Clone + Copy>(arg0: T, argo1: U) {
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Clone + Copy`
+
+error: this trait bound is already specified in the where clause
+  --> $DIR/repeated_where_clauses_or_trait_bounds.rs:12:8
+   |
+LL |     T: Clone + Clone + Clone + Copy,
+   |        ^^^^^
+   |
+   = help: consider removing this trait bound
 
 error: these where clauses contain repeated elements
   --> $DIR/repeated_where_clauses_or_trait_bounds.rs:12:8
@@ -28,6 +43,14 @@ error: these where clauses contain repeated elements
 LL |         Self: Clone + Clone + Clone;
    |               ^^^^^^^^^^^^^^^^^^^^^ help: try: `Clone`
 
+error: this trait bound is already specified in the where clause
+  --> $DIR/repeated_where_clauses_or_trait_bounds.rs:61:24
+   |
+LL | trait BadTraitBound<T: Clone + Clone + Clone + Copy, U: Clone + Copy> {
+   |                        ^^^^^
+   |
+   = help: consider removing this trait bound
+
 error: these bounds contain repeated elements
   --> $DIR/repeated_where_clauses_or_trait_bounds.rs:61:24
    |
@@ -40,17 +63,41 @@ error: these where clauses contain repeated elements
 LL |         T: Clone + Clone + Clone + Copy,
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Clone + Copy`
 
+error: this trait bound is already specified in the where clause
+  --> $DIR/repeated_where_clauses_or_trait_bounds.rs:97:20
+   |
+LL | fn good_generic<T: GenericTrait<u64> + GenericTrait<u32>>(arg0: T) {
+   |                    ^^^^^^^^^^^^^^^^^
+   |
+   = help: consider removing this trait bound
+
+error: this trait bound is already specified in the where clause
+  --> $DIR/repeated_where_clauses_or_trait_bounds.rs:101:19
+   |
+LL | fn bad_generic<T: GenericTrait<u64> + GenericTrait<u32> + GenericTrait<u64>>(arg0: T) {
+   |                   ^^^^^^^^^^^^^^^^^
+   |
+   = help: consider removing this trait bound
+
 error: these bounds contain repeated elements
   --> $DIR/repeated_where_clauses_or_trait_bounds.rs:101:19
    |
 LL | fn bad_generic<T: GenericTrait<u64> + GenericTrait<u32> + GenericTrait<u64>>(arg0: T) {
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `GenericTrait<u32> + GenericTrait<u64>`
 
+error: this trait bound is already specified in the where clause
+  --> $DIR/repeated_where_clauses_or_trait_bounds.rs:109:22
+   |
+LL | fn qualified_path<T: std::clone::Clone + Clone + foo::Clone>(arg0: T) {
+   |                      ^^^^^^^^^^^^^^^^^
+   |
+   = help: consider removing this trait bound
+
 error: these bounds contain repeated elements
   --> $DIR/repeated_where_clauses_or_trait_bounds.rs:109:22
    |
 LL | fn qualified_path<T: std::clone::Clone + Clone + foo::Clone>(arg0: T) {
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `Clone + foo::Clone`
 
-error: aborting due to 8 previous errors
+error: aborting due to 14 previous errors