Merge commit 'f6d310692116e9a527ce6d0b3526c965d9c5d7b9' into clippy-subtree-update

Author: flip1995

src/tools/clippy/CHANGELOG.md

@@ -6,7 +6,124 @@ document.
 
 ## Unreleased / Beta / In Rust Nightly
 
-[500e0ff...master](https://github.com/rust-lang/rust-clippy/compare/500e0ff...master)
+[df995e...master](https://github.com/rust-lang/rust-clippy/compare/df995e...master)
+
+## Rust 1.95
+
+Current stable, released 2026-04-16
+
+[View all 107 merged pull requests](https://github.com/rust-lang/rust-clippy/pulls?q=merged%3A2026-01-09T11%3A07%3A27Z..2026-02-23T22%3A37%3A09Z+base%3Amaster)
+
+### New Lints
+
+* Added [`unnecessary_trailing_comma`] to `pedantic`
+  [#16530](https://github.com/rust-lang/rust-clippy/pull/16530)
+* Added [`disallowed_fields`] to `style`
+  [#16218](https://github.com/rust-lang/rust-clippy/pull/16218)
+* Added [`manual_checked_ops`] to `complexity`
+  [#16149](https://github.com/rust-lang/rust-clippy/pull/16149)
+* Added [`duration_suboptimal_units`] to `pedantic`
+  [#16250](https://github.com/rust-lang/rust-clippy/pull/16250)
+* Added [`manual_take`] to `complexity`
+  [#16368](https://github.com/rust-lang/rust-clippy/pull/16368)
+
+### Enhancements
+
+* [`explicit_counter_loop`] fix FN when loop counter starts at non-zero
+  [#16620](https://github.com/rust-lang/rust-clippy/pull/16620)
+* [`manual_is_variant_and`] extend to cover `filter` chaining `is_some`
+  [#16521](https://github.com/rust-lang/rust-clippy/pull/16521)
+* [`manual_is_variant_and`] enhance to cover manual `is_none_or`
+  [#16424](https://github.com/rust-lang/rust-clippy/pull/16424)
+* [`collapsible_match`] extend to cover if-elses
+  [#16560](https://github.com/rust-lang/rust-clippy/pull/16560)
+* [`useless_conversion`] also fire inside compiler desugarings
+  [#16594](https://github.com/rust-lang/rust-clippy/pull/16594)
+* [`unwrap_used`] and [`expect_used`] add `allow-unwrap-types` configuration
+  [#16605](https://github.com/rust-lang/rust-clippy/pull/16605)
+* [`unwrap_used`] and [`expect_used`] optimize `allow-unwrap-types` evaluation to eliminate performance regression
+  [#16652](https://github.com/rust-lang/rust-clippy/pull/16652)
+* [`unchecked_time_subtraction`] extend to better handle `Duration` literals
+  [#16528](https://github.com/rust-lang/rust-clippy/pull/16528)
+* [`unnecessary_fold`] match against an accumulator on both sides
+  [#16604](https://github.com/rust-lang/rust-clippy/pull/16604)
+* [`iter_kv_map`] extend to cover `flat_map` and `filter_map`
+  [#16519](https://github.com/rust-lang/rust-clippy/pull/16519)
+* [`question_mark`] enhance to cover `else if`
+  [#16455](https://github.com/rust-lang/rust-clippy/pull/16455)
+* [`double_comparisons`] check for expressions such as `x != y && x >= y`
+  [#16033](https://github.com/rust-lang/rust-clippy/pull/16033)
+* [`needless_collect`] enhance to cover vec `push`-alike cases
+  [#16305](https://github.com/rust-lang/rust-clippy/pull/16305)
+* [`strlen_on_c_strings`] changes suggestion to use `CStr::count_bytes()`
+  [#16323](https://github.com/rust-lang/rust-clippy/pull/16323)
+* [`transmuting_null`] now checks for `ptr::without_provenance` and `ptr::without_provenance_mut`
+  [#16336](https://github.com/rust-lang/rust-clippy/pull/16336)
+* [`map_unwrap_or`] add cover for `Result::unwrap_or`
+  [#15718](https://github.com/rust-lang/rust-clippy/pull/15718)
+* [`clone_on_ref_ptr`] don't add a `&` to the receiver if it's a reference
+  [#15742](https://github.com/rust-lang/rust-clippy/pull/15742)
+* [`double_must_use`], [`drop_non_drop`], [`let_underscore_must_use`] consider `Result<T, U>` and
+  `ControlFlow<U, T>` as `T` wrt `#[must_use]` if `U` is uninhabited
+  [#16353](https://github.com/rust-lang/rust-clippy/pull/16353)
+* [`str_to_string`] handle a case when `ToString::to_string` is passed as function parameter
+  [#16512](https://github.com/rust-lang/rust-clippy/pull/16512)
+* [`must_use_candidate`] no longer lints `main` functions with return values
+  [#16552](https://github.com/rust-lang/rust-clippy/pull/16552)
+* [`needless_continue`] `allow` and `expect` attributes can also be used on the statement
+  [#16265](https://github.com/rust-lang/rust-clippy/pull/16265)
+* [`int_plus_one`] fix FN with negative literals, e.g. `-1 + x <= y`
+  [#16373](https://github.com/rust-lang/rust-clippy/pull/16373)
+
+### False Positive Fixes
+
+* [`assertions_on_result_states`] and [`missing_assert_message`] fix FP on edition 2015 and 2018
+  [#16473](https://github.com/rust-lang/rust-clippy/pull/16473)
+* [`redundant_iter_cloned`] fix FP with move closures and coroutines
+  [#16494](https://github.com/rust-lang/rust-clippy/pull/16494)
+* [`str_to_string`] fix FP on non-str types
+  [#16571](https://github.com/rust-lang/rust-clippy/pull/16571)
+* [`unnecessary_cast`] do not warn on casts of external function return type
+  [#16415](https://github.com/rust-lang/rust-clippy/pull/16415)
+* [`cmp_owned`] fix FP when `to_string` comes from macro input
+  [#16468](https://github.com/rust-lang/rust-clippy/pull/16468)
+* [`useless_attribute`] fix FP on `exported_private_dependencies` lint attributes
+  [#16470](https://github.com/rust-lang/rust-clippy/pull/16470)
+* [`manual_dangling_ptr`] fix FP when pointee type is not `Sized`
+  [#16469](https://github.com/rust-lang/rust-clippy/pull/16469)
+* [`test_attr_in_doctest`] fix FP on `test_harness`
+  [#16454](https://github.com/rust-lang/rust-clippy/pull/16454)
+* [`doc_paragraphs_missing_punctuation`] allow unpunctuated paragraphs before lists and code blocks
+  [#16487](https://github.com/rust-lang/rust-clippy/pull/16487)
+* [`elidable_lifetime_names`] skip linting proc-macro generated code
+  [#16402](https://github.com/rust-lang/rust-clippy/pull/16402)
+* [`undocumented_unsafe_blocks`] recognize safety comments inside blocks and on same line in macros
+  [#16339](https://github.com/rust-lang/rust-clippy/pull/16339)
+
+### ICE Fixes
+
+* [`match_same_arms`] fix ICE in `match_same_arms`
+  [#16685](https://github.com/rust-lang/rust-clippy/pull/16685)
+* [`nonminimal_bool`] fix ICE in `swap_binop()` by using the proper `TypeckResults`
+  [#16659](https://github.com/rust-lang/rust-clippy/pull/16659)
+* [`redundant_closure_for_method_calls`] fix ICE when computing the path from a type to itself
+  [#16362](https://github.com/rust-lang/rust-clippy/pull/16362)
+
+### Documentation Improvements
+
+* [`cast_possible_wrap`] mention `cast_{un,}signed()` methods in the documentation
+  [#16407](https://github.com/rust-lang/rust-clippy/pull/16407)
+* [`ignore_without_reason`] and [`redundant_test_prefix`] mention an extra `clippy` argument
+  needed to check tests
+  [#16205](https://github.com/rust-lang/rust-clippy/pull/16205)
+* [`doc_paragraphs_missing_punctuation`] improve its documentation
+  [#16377](https://github.com/rust-lang/rust-clippy/pull/16377)
+* [`missing_trait_methods`] better help message
+  [#16380](https://github.com/rust-lang/rust-clippy/pull/16380)
+* [`strlen_on_c_strings`] mention the specific type (`CString` or `CStr`)
+  [#16391](https://github.com/rust-lang/rust-clippy/pull/16391)
+* [`suspicious_to_owned`] improve lint messages
+  [#16376](https://github.com/rust-lang/rust-clippy/pull/16376)
 
 ## Rust 1.94
 
@@ -104,11 +221,6 @@ Current stable, released 2026-03-05
 * [`needless_type_cast`] do not ICE on struct constructor
   [#16245](https://github.com/rust-lang/rust-clippy/pull/16245)
 
-### New Lints
-
-* Added [`unnecessary_trailing_comma`] to `style` (single-line format-like macros only)
-  [#13965](https://github.com/rust-lang/rust-clippy/issues/13965)
-
 ## Rust 1.93
 
 Current stable, released 2026-01-22

src/tools/clippy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.1.96"
+version = "0.1.97"
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
@@ -33,7 +33,7 @@ color-print = "0.3.4"
 anstream = "0.6.18"
 
 [dev-dependencies]
-cargo_metadata = "0.18.1"
+cargo_metadata = "0.23"
 ui_test = "0.30.2"
 regex = "1.5.5"
 serde = { version = "1.0.145", features = ["derive"] }

src/tools/clippy/book/src/lint_configuration.md

@@ -928,6 +928,7 @@ The minimum rust version that the project supports. Defaults to the `rust-versio
 * [`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)
 * [`manual_non_exhaustive`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_non_exhaustive)
+* [`manual_noop_waker`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_noop_waker)
 * [`manual_option_as_slice`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_option_as_slice)
 * [`manual_pattern_char_comparison`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_pattern_char_comparison)
 * [`manual_range_contains`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains)

src/tools/clippy/clippy_config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy_config"
-version = "0.1.96"
+version = "0.1.97"
 edition = "2024"
 publish = false
 

src/tools/clippy/clippy_config/src/conf.rs

@@ -789,6 +789,7 @@ define_Conf! {
         manual_let_else,
         manual_midpoint,
         manual_non_exhaustive,
+        manual_noop_waker,
         manual_option_as_slice,
         manual_pattern_char_comparison,
         manual_range_contains,

src/tools/clippy/clippy_lints/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy_lints"
-version = "0.1.96"
+version = "0.1.97"
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
 repository = "https://github.com/rust-lang/rust-clippy"
 readme = "README.md"
@@ -10,7 +10,7 @@ edition = "2024"
 
 [dependencies]
 arrayvec = { version = "0.7", default-features = false }
-cargo_metadata = "0.18"
+cargo_metadata = "0.23"
 clippy_config = { path = "../clippy_config" }
 clippy_utils = { path = "../clippy_utils" }
 declare_clippy_lint = { path = "../declare_clippy_lint" }

src/tools/clippy/clippy_lints/src/arbitrary_source_item_ordering.rs

@@ -306,9 +306,16 @@ impl<'tcx> LateLintPass<'tcx> for ArbitrarySourceItemOrdering {
                     cur_f = Some(field);
                 }
             },
-            ItemKind::Trait(_constness, is_auto, _safety, _impl_restriction, _ident, _generics, _generic_bounds, item_ref)
-                if self.enable_ordering_for_trait && *is_auto == IsAuto::No =>
-            {
+            ItemKind::Trait(
+                _constness,
+                is_auto,
+                _safety,
+                _impl_restriction,
+                _ident,
+                _generics,
+                _generic_bounds,
+                item_ref,
+            ) if self.enable_ordering_for_trait && *is_auto == IsAuto::No => {
                 let mut cur_t: Option<(TraitItemId, Ident)> = None;
 
                 for &item in *item_ref {

src/tools/clippy/clippy_lints/src/booleans.rs

@@ -30,6 +30,8 @@ declare_clippy_lint! {
     /// Ignores short circuiting behavior of `||` and
     /// `&&`. Ignores `|`, `&` and `^`.
     ///
+    /// Creates a big toll on performance, **only enable sporadically**
+    ///
     /// ### Example
     /// ```ignore
     /// if a && true {}
@@ -43,7 +45,7 @@ declare_clippy_lint! {
     /// ```
     #[clippy::version = "pre 1.29.0"]
     pub NONMINIMAL_BOOL,
-    complexity,
+    pedantic,
     "boolean expressions that can be written more concisely"
 }
 
@@ -57,6 +59,7 @@ declare_clippy_lint! {
     ///
     /// ### Known problems
     /// Ignores short circuiting behavior.
+    /// Creates a big toll on performance, **only enable sporadically**
     ///
     /// ### Example
     /// ```rust,ignore
@@ -70,7 +73,7 @@ declare_clippy_lint! {
     /// ```
     #[clippy::version = "pre 1.29.0"]
     pub OVERLY_COMPLEX_BOOL_EXPR,
-    correctness,
+    pedantic,
     "boolean expressions that contain terminals which can be eliminated"
 }
 

src/tools/clippy/clippy_lints/src/byte_char_slices.rs

@@ -1,9 +1,15 @@
-use clippy_utils::diagnostics::span_lint_and_sugg;
-use rustc_ast::ast::{BorrowKind, Expr, ExprKind, Mutability};
-use rustc_ast::token::{Lit, LitKind};
+use std::borrow::Cow;
+
+use clippy_utils::diagnostics::span_lint_and_then;
+use clippy_utils::source::snippet_with_applicability;
+use clippy_utils::sugg::Sugg;
+use clippy_utils::{get_parent_expr, span_contains_cfg, span_contains_comment};
+use rustc_ast::LitKind;
 use rustc_errors::Applicability;
-use rustc_lint::{EarlyContext, EarlyLintPass};
+use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability};
+use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::declare_lint_pass;
+use rustc_span::Span;
 
 declare_clippy_lint! {
     /// ### What it does
@@ -30,47 +36,73 @@ declare_clippy_lint! {
 
 declare_lint_pass!(ByteCharSlice => [BYTE_CHAR_SLICES]);
 
-impl EarlyLintPass for ByteCharSlice {
-    fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
+impl<'tcx> LateLintPass<'tcx> for ByteCharSlice {
+    fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
         if !expr.span.from_expansion()
-            && let Some(slice) = is_byte_char_slices(expr)
+            && let Some((has_ref, slice)) = is_byte_char_slices(cx, expr)
         {
-            span_lint_and_sugg(
+            span_lint_and_then(
                 cx,
                 BYTE_CHAR_SLICES,
                 expr.span,
                 "can be more succinctly written as a byte str",
-                "try",
-                format!("b\"{slice}\""),
-                Applicability::MachineApplicable,
+                |diag| {
+                    let mut app = Applicability::MachineApplicable;
+                    let mut sugg = Sugg::hir_from_snippet(cx, expr, |_| {
+                        let mut slice = slice.iter().fold("b\"".to_owned(), |mut acc, span| {
+                            let snippet = snippet_with_applicability(cx, *span, "b'?'", &mut app);
+                            acc.push_str(match &snippet[2..snippet.len() - 1] {
+                                "\"" => "\\\"",
+                                "\\'" => "'",
+                                other => other,
+                            });
+                            acc
+                        });
+                        slice.push('"');
+                        Cow::Owned(slice)
+                    });
+                    if !has_ref && !cx.typeck_results().expr_ty_adjusted(expr).is_array_slice() {
+                        sugg = sugg.deref();
+                    }
+
+                    diag.span_suggestion(expr.span, "try", sugg, app);
+                },
             );
         }
     }
 }
 
 /// Checks whether the slice is that of byte chars, and if so, builds a byte-string out of it
-fn is_byte_char_slices(expr: &Expr) -> Option<String> {
-    if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, expr) = &expr.kind
-        && let ExprKind::Array(members) = &expr.kind
+fn is_byte_char_slices<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) -> Option<(bool, Vec<Span>)> {
+    let (has_ref, expr) = if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) = expr.kind {
+        (true, inner)
+    } else if let Some(parent) = get_parent_expr(cx, expr) // Already checked by the parent expr.
+        && let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, _) = parent.kind
+    {
+        return None;
+    } else {
+        (false, expr)
+    };
+
+    if let ExprKind::Array(members) = expr.kind
         && !members.is_empty()
+        && !span_contains_comment(cx, expr.span)
+        && !span_contains_cfg(cx, expr.span)
     {
-        members
+        return members
             .iter()
-            .map(|member| match &member.kind {
-                ExprKind::Lit(Lit {
-                    kind: LitKind::Byte,
-                    symbol,
-                    ..
-                }) => Some(symbol.as_str()),
-                _ => None,
-            })
-            .map(|maybe_quote| match maybe_quote {
-                Some("\"") => Some("\\\""),
-                Some("\\'") => Some("'"),
-                other => other,
+            .try_fold(Vec::new(), |mut acc, member| {
+                if let ExprKind::Lit(lit) = member.kind
+                    && let LitKind::Byte(_) = lit.node
+                    && expr.span.eq_ctxt(member.span)
+                {
+                    acc.push(lit.span);
+                    return Some(acc);
+                }
+                None
             })
-            .collect::<Option<String>>()
-    } else {
-        None
+            .map(|s| (has_ref, s));
     }
+
+    None
 }

src/tools/clippy/clippy_lints/src/cargo/multiple_crate_versions.rs

@@ -32,7 +32,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))
+            .filter(|p| !allowed_duplicate_crates.contains(p.name.as_str()))
             .group_by(|p| &p.name)
         {
             let group: Vec<&Package> = group.collect();