Merge branch 'master' into ignored_result_err

Author: scuzzycheese

Cargo.toml

@@ -40,7 +40,7 @@ serde = { version = "1.0.145", features = ["derive"] }
 serde_json = "1.0.122"
 walkdir = "2.3"
 filetime = "0.2.9"
-itertools = "0.12"
+itertools = "0.15"
 pulldown-cmark = { version = "0.11", default-features = false, features = ["html"] }
 askama = { version = "0.16.0", default-features = false, features = ["alloc", "config", "derive"] }
 

book/src/development/adding_lints.md

@@ -447,8 +447,8 @@ Sometimes a lint makes suggestions that require a certain version of Rust. For
 example, the `manual_strip` lint suggests using `str::strip_prefix` and
 `str::strip_suffix` which is only available after Rust 1.45. In such cases, you
 need to ensure that the MSRV configured for the project is >= the MSRV of the
-required Rust feature. If multiple features are required, just use the one with
-a lower MSRV.
+required Rust feature. If multiple features are used in a suggestion, choose a
+MSRV that supports them all.
 
 First, add an MSRV alias for the required feature in [`clippy_utils::msrvs`].
 This can be accessed later as `msrvs::STR_STRIP_PREFIX`, for example.

book/src/lint_configuration.md

@@ -967,6 +967,7 @@ The minimum rust version that the project supports. Defaults to the `rust-versio
 * [`manual_hash_one`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_hash_one)
 * [`manual_is_ascii_check`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_ascii_check)
 * [`manual_is_power_of_two`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_power_of_two)
+* [`manual_is_variant_and`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_variant_and)
 * [`manual_isolate_lowest_one`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_isolate_lowest_one)
 * [`manual_let_else`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_let_else)
 * [`manual_midpoint`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_midpoint)

clippy_config/Cargo.toml

@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 clippy_utils = { path = "../clippy_utils" }
-itertools = "0.12"
+itertools = "0.15"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.7.3"
 

clippy_config/src/conf.rs

@@ -815,6 +815,7 @@ define_Conf! {
         manual_hash_one,
         manual_is_ascii_check,
         manual_is_power_of_two,
+        manual_is_variant_and,
         manual_isolate_lowest_one,
         manual_let_else,
         manual_midpoint,

clippy_dev/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2024"
 chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
 clap = { version = "4.4", features = ["derive"] }
 indoc = "1.0"
-itertools = "0.12"
+itertools = "0.15"
 opener = "0.8"
 rustc-literal-escaper = "0.0.7"
 walkdir = "2.3"

clippy_lints/Cargo.toml

@@ -14,7 +14,7 @@ cargo_metadata = "0.23"
 clippy_config = { path = "../clippy_config" }
 clippy_utils = { path = "../clippy_utils" }
 declare_clippy_lint = { path = "../declare_clippy_lint" }
-itertools = "0.12"
+itertools = "0.15"
 quine-mc_cluskey = "0.2"
 regex-syntax = "0.8"
 serde = { version = "1.0", features = ["derive"] }

clippy_lints/src/cargo/multiple_crate_versions.rs

@@ -33,7 +33,7 @@ pub(super) fn check(cx: &LateContext<'_>, metadata: &Metadata, allowed_duplicate
         for (name, group) in &packages
             .iter()
             .filter(|p| !allowed_duplicate_crates.contains(p.name.as_str()))
-            .group_by(|p| &p.name)
+            .chunk_by(|p| &p.name)
         {
             let group: Vec<&Package> = group.collect();
 

clippy_lints/src/casts/cast_possible_wrap.rs

@@ -96,8 +96,8 @@ pub(super) fn check(
                 .note("for more information see https://doc.rust-lang.org/reference/types/numeric.html#machine-dependent-integer-types");
         }
 
-        if msrv.meets(cx, msrvs::INTEGER_SIGN_CAST)
-            && let Some(cast) = utils::is_signedness_cast(cast_from, cast_to)
+        if let Some(cast) = utils::is_signedness_cast(cast_from, cast_to)
+            && msrv.meets(cx, msrvs::INTEGER_SIGN_CAST)
         {
             let method = match cast {
                 utils::CastTo::Signed => "cast_signed()",

clippy_lints/src/casts/cast_sign_loss.rs

@@ -54,8 +54,8 @@ pub(super) fn check<'cx>(
             expr.span,
             format!("casting `{cast_from}` to `{cast_to}` may lose the sign of the value"),
             |diag| {
-                if msrv.meets(cx, msrvs::INTEGER_SIGN_CAST)
-                    && let Some(cast) = utils::is_signedness_cast(cast_from, cast_to)
+                if let Some(cast) = utils::is_signedness_cast(cast_from, cast_to)
+                    && msrv.meets(cx, msrvs::INTEGER_SIGN_CAST)
                 {
                     let method = match cast {
                         utils::CastTo::Signed => "cast_signed()",