chore(needless_if): rename to needless_ifs

Author: ada4a

CHANGELOG.md

@@ -544,7 +544,7 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[
     crate::needless_continue::NEEDLESS_CONTINUE_INFO,
     crate::needless_else::NEEDLESS_ELSE_INFO,
     crate::needless_for_each::NEEDLESS_FOR_EACH_INFO,
-    crate::needless_if::NEEDLESS_IF_INFO,
+    crate::needless_ifs::NEEDLESS_IFS_INFO,
     crate::needless_late_init::NEEDLESS_LATE_INIT_INFO,
     crate::needless_maybe_sized::NEEDLESS_MAYBE_SIZED_INFO,
     crate::needless_parens_on_range_literals::NEEDLESS_PARENS_ON_RANGE_LITERALS_INFO,

clippy_lints/src/declared_lints.rs

@@ -139,6 +139,8 @@ declare_with_version! { RENAMED(RENAMED_VERSION) = [
     ("clippy::mem_discriminant_non_enum", "enum_intrinsics_non_enums"),
     #[clippy::version = "1.80.0"]
     ("clippy::mismatched_target_os", "unexpected_cfgs"),
+    #[clippy::version = "1.92.0"]
+    ("clippy::needless_if", "clippy::needless_ifs"),
     #[clippy::version = ""]
     ("clippy::new_without_default_derive", "clippy::new_without_default"),
     #[clippy::version = ""]

clippy_lints/src/deprecated_lints.rs

@@ -253,7 +253,7 @@ mod needless_borrows_for_generic_args;
 mod needless_continue;
 mod needless_else;
 mod needless_for_each;
-mod needless_if;
+mod needless_ifs;
 mod needless_late_init;
 mod needless_maybe_sized;
 mod needless_parens_on_range_literals;
@@ -752,7 +752,7 @@ pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Co
     store.register_late_pass(|_| Box::new(endian_bytes::EndianBytes));
     store.register_late_pass(|_| Box::new(redundant_type_annotations::RedundantTypeAnnotations));
     store.register_late_pass(|_| Box::new(arc_with_non_send_sync::ArcWithNonSendSync));
-    store.register_late_pass(|_| Box::new(needless_if::NeedlessIf));
+    store.register_late_pass(|_| Box::new(needless_ifs::NeedlessIfs));
     store.register_late_pass(move |_| Box::new(min_ident_chars::MinIdentChars::new(conf)));
     store.register_late_pass(move |_| Box::new(large_stack_frames::LargeStackFrames::new(conf)));
     store.register_late_pass(|_| Box::new(single_range_in_vec_init::SingleRangeInVecInit));

clippy_lints/src/lib.rs

@@ -29,13 +29,13 @@ declare_clippy_lint! {
     /// really_expensive_condition_with_side_effects(&mut i);
     /// ```
     #[clippy::version = "1.72.0"]
-    pub NEEDLESS_IF,
+    pub NEEDLESS_IFS,
     complexity,
     "checks for empty if branches"
 }
-declare_lint_pass!(NeedlessIf => [NEEDLESS_IF]);
+declare_lint_pass!(NeedlessIfs => [NEEDLESS_IFS]);
 
-impl LateLintPass<'_> for NeedlessIf {
+impl LateLintPass<'_> for NeedlessIfs {
     fn check_stmt<'tcx>(&mut self, cx: &LateContext<'tcx>, stmt: &Stmt<'tcx>) {
         if let StmtKind::Expr(expr) = stmt.kind
             && let Some(If {
@@ -62,7 +62,7 @@ impl LateLintPass<'_> for NeedlessIf {
         {
             span_lint_and_sugg(
                 cx,
-                NEEDLESS_IF,
+                NEEDLESS_IFS,
                 stmt.span,
                 "this `if` branch is empty",
                 "you can remove it",

clippy_lints/src/needless_if.rs renamed to clippy_lints/src/needless_ifs.rs

@@ -9,7 +9,7 @@
     clippy::no_effect,
     clippy::unnecessary_operation,
     clippy::never_loop,
-    clippy::needless_if,
+    clippy::needless_ifs,
     clippy::collapsible_if,
     clippy::blocks_in_conditions,
     clippy::single_match,

tests/ui-toml/excessive_nesting/excessive_nesting.rs

@@ -1,5 +1,5 @@
 #![feature(proc_macro_span)]
-#![allow(clippy::needless_if, dead_code)]
+#![allow(clippy::needless_ifs, dead_code)]
 
 extern crate proc_macro;
 

tests/ui/auxiliary/proc_macros.rs

@@ -4,7 +4,7 @@
 #![allow(
     unused,
     unnecessary_transmutes,
-    clippy::needless_if,
+    clippy::needless_ifs,
     clippy::missing_transmute_annotations
 )]
 #![warn(clippy::nonminimal_bool)]

tests/ui/blocks_in_conditions.fixed

@@ -4,7 +4,7 @@
 #![allow(
     unused,
     unnecessary_transmutes,
-    clippy::needless_if,
+    clippy::needless_ifs,
     clippy::missing_transmute_annotations
 )]
 #![warn(clippy::nonminimal_bool)]

tests/ui/blocks_in_conditions.rs

@@ -1,4 +1,4 @@
-#![allow(non_local_definitions, clippy::needless_if)]
+#![allow(non_local_definitions, clippy::needless_ifs)]
 #![warn(clippy::bool_comparison)]
 #![allow(clippy::non_canonical_partial_ord_impl)]