make lint name plural

ada4a · ada4a · commit 18f8a05d81c7 · 2025-07-02T18:08:51.000+02:00
required by the naming guidelines
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5836,7 +5836,7 @@ Released 2018-09-13
 [`drop_copy`]: https://rust-lang.github.io/rust-clippy/master/index.html#drop_copy
 [`drop_non_drop`]: https://rust-lang.github.io/rust-clippy/master/index.html#drop_non_drop
 [`drop_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#drop_ref
-[`duplicate_match_guard`]: https://rust-lang.github.io/rust-clippy/master/index.html#duplicate_match_guard
+[`duplicate_match_guards`]: https://rust-lang.github.io/rust-clippy/master/index.html#duplicate_match_guards
 [`duplicate_mod`]: https://rust-lang.github.io/rust-clippy/master/index.html#duplicate_mod
 [`duplicate_underscore_argument`]: https://rust-lang.github.io/rust-clippy/master/index.html#duplicate_underscore_argument
 [`duplicated_attributes`]: https://rust-lang.github.io/rust-clippy/master/index.html#duplicated_attributes
diff --git a/clippy_lints/src/declared_lints.rs b/clippy_lints/src/declared_lints.rs
@@ -135,7 +135,7 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[
     crate::drop_forget_ref::DROP_NON_DROP_INFO,
     crate::drop_forget_ref::FORGET_NON_DROP_INFO,
     crate::drop_forget_ref::MEM_FORGET_INFO,
-    crate::duplicate_match_guard::DUPLICATE_MATCH_GUARD_INFO,
+    crate::duplicate_match_guards::DUPLICATE_MATCH_GUARDS_INFO,
     crate::duplicate_mod::DUPLICATE_MOD_INFO,
     crate::else_if_without_else::ELSE_IF_WITHOUT_ELSE_INFO,
     crate::empty_drop::EMPTY_DROP_INFO,
diff --git a/clippy_lints/src/duplicate_match_guards.rs b/clippy_lints/src/duplicate_match_guards.rs
@@ -45,13 +45,13 @@ declare_clippy_lint! {
     /// }
     /// ```
     #[clippy::version = "1.89.0"]
-    pub DUPLICATE_MATCH_GUARD,
+    pub DUPLICATE_MATCH_GUARDS,
     nursery,
     "a condition in match body duplicating the match guard"
 }
-declare_lint_pass!(DuplicateMatchGuard => [DUPLICATE_MATCH_GUARD]);
+declare_lint_pass!(DuplicateMatchGuards => [DUPLICATE_MATCH_GUARDS]);
 
-impl<'tcx> LateLintPass<'tcx> for DuplicateMatchGuard {
+impl<'tcx> LateLintPass<'tcx> for DuplicateMatchGuards {
     fn check_arm(&mut self, cx: &LateContext<'tcx>, arm: &'tcx Arm<'tcx>) {
         let Some(guard) = arm.guard else {
             return;
@@ -100,7 +100,7 @@ impl<'tcx> LateLintPass<'tcx> for DuplicateMatchGuard {
                 // since the arm body already has braces
                 span_lint_and_then(
                     cx,
-                    DUPLICATE_MATCH_GUARD,
+                    DUPLICATE_MATCH_GUARDS,
                     arm_body_expr.span,
                     "condition duplicates match guard",
                     |diag| {
@@ -123,7 +123,7 @@ impl<'tcx> LateLintPass<'tcx> for DuplicateMatchGuard {
                 // since there are no outer braces coming from the arm body
                 span_lint_and_sugg(
                     cx,
-                    DUPLICATE_MATCH_GUARD,
+                    DUPLICATE_MATCH_GUARDS,
                     arm_body_expr.span,
                     "condition duplicates match guard",
                     "remove the condition",
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
@@ -121,7 +121,7 @@ mod disallowed_types;
 mod doc;
 mod double_parens;
 mod drop_forget_ref;
-mod duplicate_match_guard;
+mod duplicate_match_guards;
 mod duplicate_mod;
 mod else_if_without_else;
 mod empty_drop;
@@ -831,6 +831,6 @@ pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Co
     store.register_late_pass(|_| Box::new(cloned_ref_to_slice_refs::ClonedRefToSliceRefs::new(conf)));
     store.register_late_pass(|_| Box::new(infallible_try_from::InfallibleTryFrom));
     store.register_late_pass(|_| Box::new(coerce_container_to_any::CoerceContainerToAny));
-    store.register_late_pass(|_| Box::new(duplicate_match_guard::DuplicateMatchGuard));
+    store.register_late_pass(|_| Box::new(duplicate_match_guards::DuplicateMatchGuards));
     // add lints here, do not remove this comment, it's used in `new_lint`
 }
diff --git a/tests/ui/duplicate_match_guards.fixed b/tests/ui/duplicate_match_guards.fixed
@@ -1,5 +1,5 @@
 #![allow(clippy::needless_return, clippy::needless_else)]
-#![warn(clippy::duplicate_match_guard)]
+#![warn(clippy::duplicate_match_guards)]
 
 fn main() {
     let mut a = 5;
@@ -9,34 +9,34 @@ fn main() {
     match 0u32 {
         0 if true => {
             {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         0 if a > b => {
             {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         // not _identical_, but the meaning is the same
         0 if a > b => {
             {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         // a bit more complicated
         0 if a > 0 && b > 0 => {
             {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         // no curlies around arm body
         #[rustfmt::skip] // would add the outer curlies
         0 if true => {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
         },
 
diff --git a/tests/ui/duplicate_match_guards.rs b/tests/ui/duplicate_match_guards.rs
@@ -1,5 +1,5 @@
 #![allow(clippy::needless_return, clippy::needless_else)]
-#![warn(clippy::duplicate_match_guard)]
+#![warn(clippy::duplicate_match_guards)]
 
 fn main() {
     let mut a = 5;
@@ -9,34 +9,34 @@ fn main() {
     match 0u32 {
         0 if true => {
             if true {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         0 if a > b => {
             if a > b {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         // not _identical_, but the meaning is the same
         0 if a > b => {
             if b < a {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         // a bit more complicated
         0 if a > 0 && b > 0 => {
             if a > 0 && b > 0 {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
             }
         },
         // no curlies around arm body
         #[rustfmt::skip] // would add the outer curlies
         0 if true => if true {
-                //~^ duplicate_match_guard
+                //~^ duplicate_match_guards
                 return;
         },
 
diff --git a/tests/ui/duplicate_match_guards.stderr b/tests/ui/duplicate_match_guards.stderr
@@ -1,14 +1,14 @@
 error: condition duplicates match guard
-  --> tests/ui/duplicate_match_guard.rs:11:13
+  --> tests/ui/duplicate_match_guards.rs:11:13
    |
 LL | /             if true {
 LL | |
 LL | |                 return;
 LL | |             }
    | |_____________^
    |
-   = note: `-D clippy::duplicate-match-guard` implied by `-D warnings`
-   = help: to override `-D warnings` add `#[allow(clippy::duplicate_match_guard)]`
+   = note: `-D clippy::duplicate-match-guards` implied by `-D warnings`
+   = help: to override `-D warnings` add `#[allow(clippy::duplicate_match_guards)]`
 help: remove the condition
    |
 LL ~             {
@@ -18,7 +18,7 @@ LL +             }
    |
 
 error: condition duplicates match guard
-  --> tests/ui/duplicate_match_guard.rs:17:13
+  --> tests/ui/duplicate_match_guards.rs:17:13
    |
 LL | /             if a > b {
 LL | |
@@ -35,7 +35,7 @@ LL +             }
    |
 
 error: condition duplicates match guard
-  --> tests/ui/duplicate_match_guard.rs:24:13
+  --> tests/ui/duplicate_match_guards.rs:24:13
    |
 LL | /             if b < a {
 LL | |
@@ -52,7 +52,7 @@ LL +             }
    |
 
 error: condition duplicates match guard
-  --> tests/ui/duplicate_match_guard.rs:31:13
+  --> tests/ui/duplicate_match_guards.rs:31:13
    |
 LL | /             if a > 0 && b > 0 {
 LL | |
@@ -69,7 +69,7 @@ LL +             }
    |
 
 error: condition duplicates match guard
-  --> tests/ui/duplicate_match_guard.rs:38:22
+  --> tests/ui/duplicate_match_guards.rs:38:22
    |
 LL |           0 if true => if true {
    |  ______________________^

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#![allow(clippy::needless_return, clippy::needless_else)]`
`2`		`-#![warn(clippy::duplicate_match_guard)]`
	`2`	`+#![warn(clippy::duplicate_match_guards)]`
`3`	`3`
`4`	`4`	`fn main() {`
`5`	`5`	`let mut a = 5;`
`@@ -9,34 +9,34 @@ fn main() {`
`9`	`9`	`match 0u32 {`
`10`	`10`	`0 if true => {`
`11`	`11`	`{`
`12`		`- //~^ duplicate_match_guard`
	`12`	`+ //~^ duplicate_match_guards`
`13`	`13`	`return;`
`14`	`14`	`}`
`15`	`15`	`},`
`16`	`16`	`0 if a > b => {`
`17`	`17`	`{`
`18`		`- //~^ duplicate_match_guard`
	`18`	`+ //~^ duplicate_match_guards`
`19`	`19`	`return;`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`// not _identical_, but the meaning is the same`
`23`	`23`	`0 if a > b => {`
`24`	`24`	`{`
`25`		`- //~^ duplicate_match_guard`
	`25`	`+ //~^ duplicate_match_guards`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`// a bit more complicated`
`30`	`30`	`0 if a > 0 && b > 0 => {`
`31`	`31`	`{`
`32`		`- //~^ duplicate_match_guard`
	`32`	`+ //~^ duplicate_match_guards`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`	`},`
`36`	`36`	`// no curlies around arm body`
`37`	`37`	`#[rustfmt::skip] // would add the outer curlies`
`38`	`38`	`0 if true => {`
`39`		`- //~^ duplicate_match_guard`
	`39`	`+ //~^ duplicate_match_guards`
`40`	`40`	`return;`
`41`	`41`	`},`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`error: condition duplicates match guard`
`2`		`- --> tests/ui/duplicate_match_guard.rs:11:13`
	`2`	`+ --> tests/ui/duplicate_match_guards.rs:11:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| / if true {`
`5`	`5`	`LL \| \|`
`6`	`6`	`LL \| \| return;`
`7`	`7`	`LL \| \| }`
`8`	`8`	`\| \|_____________^`
`9`	`9`	`\|`
`10`		- = note: `-D clippy::duplicate-match-guard` implied by `-D warnings`
`11`		- = help: to override `-D warnings` add `#[allow(clippy::duplicate_match_guard)]`
	`10`	+ = note: `-D clippy::duplicate-match-guards` implied by `-D warnings`
	`11`	+ = help: to override `-D warnings` add `#[allow(clippy::duplicate_match_guards)]`
`12`	`12`	`help: remove the condition`
`13`	`13`	`\|`
`14`	`14`	`LL ~ {`
`@@ -18,7 +18,7 @@ LL + }`
`18`	`18`	`\|`
`19`	`19`
`20`	`20`	`error: condition duplicates match guard`
`21`		`- --> tests/ui/duplicate_match_guard.rs:17:13`
	`21`	`+ --> tests/ui/duplicate_match_guards.rs:17:13`
`22`	`22`	`\|`
`23`	`23`	`LL \| / if a > b {`
`24`	`24`	`LL \| \|`
`@@ -35,7 +35,7 @@ LL + }`
`35`	`35`	`\|`
`36`	`36`
`37`	`37`	`error: condition duplicates match guard`
`38`		`- --> tests/ui/duplicate_match_guard.rs:24:13`
	`38`	`+ --> tests/ui/duplicate_match_guards.rs:24:13`
`39`	`39`	`\|`
`40`	`40`	`LL \| / if b < a {`
`41`	`41`	`LL \| \|`
`@@ -52,7 +52,7 @@ LL + }`
`52`	`52`	`\|`
`53`	`53`
`54`	`54`	`error: condition duplicates match guard`
`55`		`- --> tests/ui/duplicate_match_guard.rs:31:13`
	`55`	`+ --> tests/ui/duplicate_match_guards.rs:31:13`
`56`	`56`	`\|`
`57`	`57`	`LL \| / if a > 0 && b > 0 {`
`58`	`58`	`LL \| \|`
`@@ -69,7 +69,7 @@ LL + }`
`69`	`69`	`\|`
`70`	`70`
`71`	`71`	`error: condition duplicates match guard`
`72`		`- --> tests/ui/duplicate_match_guard.rs:38:22`
	`72`	`+ --> tests/ui/duplicate_match_guards.rs:38:22`
`73`	`73`	`\|`
`74`	`74`	`LL \| 0 if true => if true {`
`75`	`75`	`\| ______________________^`