Rollup merge of #81038 - flip1995:clippyup, r=Manishearth

Update Clippy

Biweekly Clippy update

r? ``@Manishearth``

diff --cc src/tools/clippy/clippy_lints/src/attrs.rs
Simple merge

diff --cc src/tools/clippy/clippy_lints/src/lib.rs
index aaa17561f06d33b1c01d4264319930af032bf581,f12994c7a605e21a7e8cafde3bd1cd7d489672c5..781282cdfbd03e9541cdfffbb5bad78103347d74
--- 1/src/tools/clippy/clippy_lints/src/lib.rs
--- 2/src/tools/clippy/clippy_lints/src/lib.rs
+++ b/src/tools/clippy/clippy_lints/src/lib.rs
@@@ -1652,8 -1666,10 +1668,9 @@@ pub fn register_plugins(store: &mut rus
          LintId::of(&assertions_on_constants::ASSERTIONS_ON_CONSTANTS),
          LintId::of(&assign_ops::ASSIGN_OP_PATTERN),
          LintId::of(&attrs::BLANKET_CLIPPY_RESTRICTION_LINTS),
 -        LintId::of(&attrs::UNKNOWN_CLIPPY_LINTS),
          LintId::of(&blacklisted_name::BLACKLISTED_NAME),
          LintId::of(&blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS),
+         LintId::of(&collapsible_if::COLLAPSIBLE_ELSE_IF),
          LintId::of(&collapsible_if::COLLAPSIBLE_IF),
          LintId::of(&collapsible_match::COLLAPSIBLE_MATCH),
          LintId::of(&comparison_chain::COMPARISON_CHAIN),

diff --cc src/tools/clippy/clippy_lints/src/methods/mod.rs
Simple merge

diff --cc src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs
Simple merge

diff --cc src/tools/clippy/clippy_lints/src/utils/mod.rs
Simple merge