Move collapsible_else_if to pedantic (#16211)

Looks like a good number of people disagree with this lint so it
shouldn't be on by default

Fixes #16209

changelog: [`collapsible_else_if`]: move to `pedantic`

Author: Jarcho

clippy_lints/src/collapsible_if.rs

@@ -76,7 +76,7 @@ declare_clippy_lint! {
     /// ```
     #[clippy::version = "1.51.0"]
     pub COLLAPSIBLE_ELSE_IF,
-    style,
+    pedantic,
     "nested `else`-`if` expressions that can be collapsed (e.g., `else { if x { ... } }`)"
 }
 

tests/ui-toml/collapsible_if/collapsible_else_if.fixed

@@ -1,5 +1,5 @@
 #![allow(clippy::eq_op, clippy::nonminimal_bool)]
-#![warn(clippy::collapsible_if)]
+#![warn(clippy::collapsible_else_if)]
 
 #[rustfmt::skip]
 fn main() {

tests/ui-toml/collapsible_if/collapsible_else_if.rs

@@ -1,5 +1,5 @@
 #![allow(clippy::eq_op, clippy::nonminimal_bool)]
-#![warn(clippy::collapsible_if)]
+#![warn(clippy::collapsible_else_if)]
 
 #[rustfmt::skip]
 fn main() {

tests/ui/collapsible_else_if.fixed

@@ -1,5 +1,5 @@
 #![allow(clippy::assertions_on_constants, clippy::equatable_if_let, clippy::needless_ifs)]
-#![warn(clippy::collapsible_if, clippy::collapsible_else_if)]
+#![warn(clippy::collapsible_else_if)]
 
 #[rustfmt::skip]
 fn main() {
@@ -88,30 +88,12 @@ fn issue_7318() {
 }
 
 fn issue_13365() {
-    // all the `expect`s that we should fulfill
+    // ensure we fulfill `#[expect]`
     if true {
     } else {
         #[expect(clippy::collapsible_else_if)]
         if false {}
     }
-
-    if true {
-    } else {
-        #[expect(clippy::style)]
-        if false {}
-    }
-
-    if true {
-    } else {
-        #[expect(clippy::all)]
-        if false {}
-    }
-
-    if true {
-    } else {
-        #[expect(warnings)]
-        if false {}
-    }
 }
 
 fn issue14799() {

tests/ui/collapsible_else_if.rs

@@ -1,5 +1,5 @@
 #![allow(clippy::assertions_on_constants, clippy::equatable_if_let, clippy::needless_ifs)]
-#![warn(clippy::collapsible_if, clippy::collapsible_else_if)]
+#![warn(clippy::collapsible_else_if)]
 
 #[rustfmt::skip]
 fn main() {
@@ -104,30 +104,12 @@ fn issue_7318() {
 }
 
 fn issue_13365() {
-    // all the `expect`s that we should fulfill
+    // ensure we fulfill `#[expect]`
     if true {
     } else {
         #[expect(clippy::collapsible_else_if)]
         if false {}
     }
-
-    if true {
-    } else {
-        #[expect(clippy::style)]
-        if false {}
-    }
-
-    if true {
-    } else {
-        #[expect(clippy::all)]
-        if false {}
-    }
-
-    if true {
-    } else {
-        #[expect(warnings)]
-        if false {}
-    }
 }
 
 fn issue14799() {

tests/ui/collapsible_else_if.stderr

@@ -151,7 +151,7 @@ LL | |     }
    | |_____^ help: collapse nested if block: `if false {}`
 
 error: this `else { if .. }` block can be collapsed
-  --> tests/ui/collapsible_else_if.rs:157:12
+  --> tests/ui/collapsible_else_if.rs:139:12
    |
 LL |       } else {
    |  ____________^