Clippy subtree update

compiler/rustc_codegen_gcc/src/declare.rs

@@ -151,7 +151,6 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
 ///
 /// If there’s a value with the same name already declared, the function will
 /// update the declaration and return existing Value instead.
-#[expect(clippy::let_and_return)]
 fn declare_raw_fn<'gcc>(
     cx: &CodegenCx<'gcc, '_>,
     name: &str,

src/tools/clippy/Cargo.toml

@@ -42,7 +42,7 @@ walkdir = "2.3"
 filetime = "0.2.9"
 itertools = "0.12"
 pulldown-cmark = { version = "0.11", default-features = false, features = ["html"] }
-askama = { version = "0.15", default-features = false, features = ["alloc", "config", "derive"] }
+askama = { version = "0.15.4", default-features = false, features = ["alloc", "config", "derive"] }
 
 [dev-dependencies.toml]
 version = "0.9.7"

src/tools/clippy/book/src/development/infrastructure/sync.md

@@ -79,7 +79,7 @@ to be run inside the `rust` directory):
     ```bash
     git fetch upstream  # assuming upstream is the rust-lang/rust remote
     git switch rustup
-    git merge upstream/master --no-ff
+    git merge upstream/main --no-ff
     ```
     > Note: This is one of the few instances where a merge commit is allowed in
     > a PR.
@@ -99,7 +99,7 @@ to be run inside the `rust` directory):
 
 All the following commands have to be run inside the `rust` directory.
 
-1. Make sure you have checked out the latest `master` of `rust-lang/rust`.
+1. Make sure you have checked out the latest `main` of `rust-lang/rust`.
 2. Sync the `rust-lang/rust-clippy` master to the rust-copy of Clippy:
     ```bash
     git switch -c clippy-subtree-update

src/tools/clippy/book/src/development/type_checking.md

@@ -146,15 +146,15 @@ in this chapter:
 
 - [Stages of compilation](https://rustc-dev-guide.rust-lang.org/compiler-src.html#the-main-stages-of-compilation)
 - [Diagnostic items](https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-items.html)
-- [Type checking](https://rustc-dev-guide.rust-lang.org/type-checking.html)
+- [Type checking](https://rustc-dev-guide.rust-lang.org/hir-typeck/summary.html)
 - [Ty module](https://rustc-dev-guide.rust-lang.org/ty.html)
 
 [Adt]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_type_ir/ty_kind/enum.TyKind.html#variant.Adt
 [AdtDef]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/adt/struct.AdtDef.html
 [expr_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeckResults.html#method.expr_ty
 [node_type]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeckResults.html#method.node_type
 [is_char]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.Ty.html#method.is_char
-[is_char_source]: https://doc.rust-lang.org/nightly/nightly-rustc/src/rustc_middle/ty/sty.rs.html#1831-1834
+[is_char_source]: https://github.com/rust-lang/rust/blob/d34f1f931489618efffc4007e6b6bdb9e10f6467/compiler/rustc_middle/src/ty/sty.rs#L1429-L1432
 [kind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.Ty.html#method.kind
 [LateContext]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/struct.LateContext.html
 [LateLintPass]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lint/trait.LateLintPass.html
@@ -163,5 +163,5 @@ in this chapter:
 [TyKind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_type_ir/ty_kind/enum.TyKind.html
 [TypeckResults]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TypeckResults.html
 [middle_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.Ty.html
-[hir_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.Ty.html
+[hir_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir/struct.Ty.html
 [lower_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir_analysis/fn.lower_ty.html

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

@@ -246,7 +246,7 @@ A list of crate names to allow duplicates of
 
 ## `allowed-idents-below-min-chars`
 Allowed names below the minimum allowed characters. The value `".."` can be used as part of
-the list to indicate, that the configured values should be appended to the default
+the list to indicate that the configured values should be appended to the default
 configuration of Clippy. By default, any configuration will replace the default value.
 
 **Default Value:** `["i", "j", "x", "y", "z", "w", "n"]`
@@ -570,12 +570,12 @@ The list of disallowed types, written as fully qualified paths.
 
 ## `doc-valid-idents`
 The list of words this lint should not consider as identifiers needing ticks. The value
-`".."` can be used as part of the list to indicate, that the configured values should be appended to the
+`".."` can be used as part of the list to indicate that the configured values should be appended to the
 default configuration of Clippy. By default, any configuration will replace the default value. For example:
 * `doc-valid-idents = ["ClipPy"]` would replace the default list with `["ClipPy"]`.
 * `doc-valid-idents = ["ClipPy", ".."]` would append `ClipPy` to the default list.
 
-**Default Value:** `["KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "MHz", "GHz", "THz", "AccessKit", "CoAP", "CoreFoundation", "CoreGraphics", "CoreText", "DevOps", "Direct2D", "Direct3D", "DirectWrite", "DirectX", "ECMAScript", "GPLv2", "GPLv3", "GitHub", "GitLab", "IPv4", "IPv6", "InfiniBand", "RoCE", "ClojureScript", "CoffeeScript", "JavaScript", "PostScript", "PureScript", "TypeScript", "PowerPC", "WebAssembly", "NaN", "NaNs", "OAuth", "GraphQL", "OCaml", "OpenAL", "OpenDNS", "OpenGL", "OpenMP", "OpenSSH", "OpenSSL", "OpenStreetMap", "OpenTelemetry", "OpenType", "WebGL", "WebGL2", "WebGPU", "WebRTC", "WebSocket", "WebTransport", "WebP", "OpenExr", "YCbCr", "sRGB", "TensorFlow", "TrueType", "iOS", "macOS", "FreeBSD", "NetBSD", "OpenBSD", "NixOS", "TeX", "LaTeX", "BibTeX", "BibLaTeX", "MinGW", "CamelCase"]`
+**Default Value:** `["KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "MHz", "GHz", "THz", "AccessKit", "CoAP", "CoreFoundation", "CoreGraphics", "CoreText", "DevOps", "Direct2D", "Direct3D", "DirectWrite", "DirectX", "ECMAScript", "GPLv2", "GPLv3", "GitHub", "GitLab", "IPv4", "IPv6", "InfiniBand", "RoCE", "ClojureScript", "CoffeeScript", "JavaScript", "PostScript", "PureScript", "TypeScript", "PowerPC", "PowerShell", "WebAssembly", "NaN", "NaNs", "OAuth", "GraphQL", "OCaml", "OpenAL", "OpenDNS", "OpenGL", "OpenMP", "OpenSSH", "OpenSSL", "OpenStreetMap", "OpenTelemetry", "OpenType", "WebGL", "WebGL2", "WebGPU", "WebRTC", "WebSocket", "WebTransport", "WebP", "OpenExr", "YCbCr", "sRGB", "TensorFlow", "TrueType", "iOS", "macOS", "FreeBSD", "NetBSD", "OpenBSD", "NixOS", "TeX", "LaTeX", "BibTeX", "BibLaTeX", "MinGW", "CamelCase"]`
 
 ---
 **Affected lints:**

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

@@ -35,7 +35,7 @@ const DEFAULT_DOC_VALID_IDENTS: &[&str] = &[
     "IPv4", "IPv6",
     "InfiniBand", "RoCE",
     "ClojureScript", "CoffeeScript", "JavaScript", "PostScript", "PureScript", "TypeScript",
-    "PowerPC", "WebAssembly",
+    "PowerPC", "PowerShell", "WebAssembly",
     "NaN", "NaNs",
     "OAuth", "GraphQL",
     "OCaml",
@@ -423,7 +423,7 @@ define_Conf! {
     #[lints(multiple_crate_versions)]
     allowed_duplicate_crates: Vec<String> = Vec::new(),
     /// Allowed names below the minimum allowed characters. The value `".."` can be used as part of
-    /// the list to indicate, that the configured values should be appended to the default
+    /// the list to indicate that the configured values should be appended to the default
     /// configuration of Clippy. By default, any configuration will replace the default value.
     #[lints(min_ident_chars)]
     allowed_idents_below_min_chars: Vec<String> =
@@ -620,7 +620,7 @@ define_Conf! {
     #[lints(disallowed_types)]
     disallowed_types: Vec<DisallowedPath> = Vec::new(),
     /// The list of words this lint should not consider as identifiers needing ticks. The value
-    /// `".."` can be used as part of the list to indicate, that the configured values should be appended to the
+    /// `".."` can be used as part of the list to indicate that the configured values should be appended to the
     /// default configuration of Clippy. By default, any configuration will replace the default value. For example:
     /// * `doc-valid-idents = ["ClipPy"]` would replace the default list with `["ClipPy"]`.
     /// * `doc-valid-idents = ["ClipPy", ".."]` would append `ClipPy` to the default list.

src/tools/clippy/clippy_dev/src/new_lint.rs

@@ -167,9 +167,9 @@ fn add_lint(lint: &LintData<'_>, enable_msrv: bool) -> io::Result<()> {
     let camel_name = to_camel_case(lint.name);
 
     let new_lint = if enable_msrv {
-        format!("Box::new(move |{ctor_arg}| Box::new({module_name}::{camel_name}::new(conf))),\n        ",)
+        format!("Box::new(move |{ctor_arg}| Box::new({module_name}::{camel_name}::new(conf))),\n        ")
     } else {
-        format!("Box::new(|{ctor_arg}| Box::new({module_name}::{camel_name})),\n        ",)
+        format!("Box::new(|{ctor_arg}| Box::new({module_name}::{camel_name})),\n        ")
     };
 
     lib_rs.insert_str(comment_start, &new_lint);

src/tools/clippy/clippy_lints/src/attrs/useless_attribute.rs

@@ -31,6 +31,7 @@ pub(super) fn check(cx: &EarlyContext<'_>, item: &Item, attrs: &[Attribute]) {
                                     | sym::dead_code
                                     | sym::deprecated
                                     | sym::deprecated_in_future
+                                    | sym::exported_private_dependencies
                                     | sym::hidden_glob_reexports
                                     | sym::unreachable_pub
                                     | sym::unused

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

@@ -100,7 +100,7 @@ fn check_table(cx: &LateContext<'_>, table: &DeTable<'_>, known_groups: &FxHashS
                             "to have lints override the group set `{}` to a lower priority",
                             group.as_ref()
                         ),
-                        format!("{{ level = {:?}, priority = {low_priority} }}", group_config.level,),
+                        format!("{{ level = {:?}, priority = {low_priority} }}", group_config.level),
                         Applicability::MaybeIncorrect,
                     );
                 },

src/tools/clippy/clippy_lints/src/casts/cast_possible_truncation.rs

@@ -117,7 +117,7 @@ pub(super) fn check(
                 return;
             }
 
-            format!("casting `{cast_from}` to `{cast_to}` may truncate the value{suffix}",)
+            format!("casting `{cast_from}` to `{cast_to}` may truncate the value{suffix}")
         },
 
         (ty::Adt(def, _), Some(to_nbits)) if def.is_enum() => {

src/tools/clippy/clippy_lints/src/casts/manual_dangling_ptr.rs

@@ -15,6 +15,8 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, from: &Expr<'_>, to:
         let init_expr = expr_or_init(cx, from);
         if is_expr_const_aligned(cx, init_expr, ptr_ty.ty)
             && let Some(std_or_core) = std_or_core(cx)
+            && let pointee_ty = cx.typeck_results().node_type(ptr_ty.ty.hir_id)
+            && pointee_ty.is_sized(cx.tcx, cx.typing_env())
         {
             let sugg_fn = match ptr_ty.mutbl {
                 Mutability::Not => "ptr::dangling",

src/tools/clippy/clippy_lints/src/dbg_macro.rs

@@ -75,45 +75,47 @@ impl LateLintPass<'_> for DbgMacro {
                 "the `dbg!` macro is intended as a debugging tool",
                 |diag| {
                     let mut applicability = Applicability::MachineApplicable;
-                    let (sugg_span, suggestion) =
-                        match is_async_move_desugar(expr).unwrap_or(expr).peel_drop_temps().kind {
-                            // dbg!()
-                            ExprKind::Block(..) => {
-                                // If the `dbg!` macro is a "free" statement and not contained within other expressions,
-                                // remove the whole statement.
-                                if let Node::Stmt(_) = cx.tcx.parent_hir_node(expr.hir_id)
-                                    && let Some(semi_span) =
-                                        cx.sess().source_map().mac_call_stmt_semi_span(macro_call.span)
-                                {
-                                    (macro_call.span.to(semi_span), String::new())
-                                } else {
-                                    (macro_call.span, String::from("()"))
-                                }
-                            },
-                            ExprKind::Match(first, arms, _) => {
-                                let vals = collect_vals(first, arms);
-                                let suggestion = match vals.as_slice() {
-                                    // dbg!(1) => 1
-                                    &[val] => {
-                                        snippet_with_applicability(cx, val.span.source_callsite(), "..", &mut applicability)
-                                            .to_string()
-                                    }
-                                    // dbg!(2, 3) => (2, 3)
-                                    &[first, .., last] => {
-                                        let snippet = snippet_with_applicability(
-                                            cx,
-                                            first.span.source_callsite().to(last.span.source_callsite()),
-                                            "..",
-                                            &mut applicability,
-                                        );
-                                        format!("({snippet})")
-                                    }
-                                    _ => unreachable!(),
-                                };
-                                (macro_call.span, suggestion)
-                            },
-                            _ => unreachable!(),
-                        };
+                    let (sugg_span, suggestion) = match is_async_move_desugar(expr)
+                        .unwrap_or(expr)
+                        .peel_drop_temps()
+                        .kind
+                    {
+                        // dbg!()
+                        ExprKind::Block(..) => {
+                            // If the `dbg!` macro is a "free" statement and not contained within other expressions,
+                            // remove the whole statement.
+                            if let Node::Stmt(_) = cx.tcx.parent_hir_node(expr.hir_id)
+                                && let Some(semi_span) = cx.sess().source_map().mac_call_stmt_semi_span(macro_call.span)
+                            {
+                                (macro_call.span.to(semi_span), String::new())
+                            } else {
+                                (macro_call.span, String::from("()"))
+                            }
+                        },
+                        ExprKind::Match(first, arms, _) => {
+                            let vals = collect_vals(first, arms);
+                            let suggestion = match *vals.as_slice() {
+                                // dbg!(1) => 1
+                                [val] => {
+                                    snippet_with_applicability(cx, val.span.source_callsite(), "..", &mut applicability)
+                                        .to_string()
+                                },
+                                // dbg!(2, 3) => (2, 3)
+                                [first, .., last] => {
+                                    let snippet = snippet_with_applicability(
+                                        cx,
+                                        first.span.source_callsite().to(last.span.source_callsite()),
+                                        "..",
+                                        &mut applicability,
+                                    );
+                                    format!("({snippet})")
+                                },
+                                _ => unreachable!(),
+                            };
+                            (macro_call.span, suggestion)
+                        },
+                        _ => unreachable!(),
+                    };
 
                     diag.span_suggestion(
                         sugg_span,
@@ -165,7 +167,7 @@ fn first_dbg_macro_in_expansion(cx: &LateContext<'_>, span: Span) -> Option<Macr
 }
 
 /// Extracts all value expressions from the `match`-tree generated by `dbg!`.
-/// 
+///
 /// E.g. from
 /// ```rust, ignore
 /// match 1 {
@@ -181,14 +183,20 @@ fn first_dbg_macro_in_expansion(cx: &LateContext<'_>, span: Span) -> Option<Macr
 fn collect_vals<'hir>(first: &'hir Expr<'hir>, mut arms: &'hir [Arm<'hir>]) -> Vec<&'hir Expr<'hir>> {
     let mut vals = vec![first];
     loop {
-        let [arm] = arms else { unreachable!("dbg! macro expansion only has single-arm matches") };
+        let [arm] = arms else {
+            unreachable!("dbg! macro expansion only has single-arm matches")
+        };
 
-        match is_async_move_desugar(arm.body).unwrap_or(arm.body).peel_drop_temps().kind {
+        match is_async_move_desugar(arm.body)
+            .unwrap_or(arm.body)
+            .peel_drop_temps()
+            .kind
+        {
             ExprKind::Block(..) => return vals,
             ExprKind::Match(val, a, _) => {
                 vals.push(val);
                 arms = a;
-            }
+            },
             _ => unreachable!("dbg! macro expansion only results in block or match expressions"),
         }
     }

src/tools/clippy/clippy_lints/src/doc/doc_paragraphs_missing_punctuation.rs

@@ -53,21 +53,26 @@ fn is_missing_punctuation(doc_string: &str) -> Vec<MissingPunctuation> {
     let mut no_report_depth = 0;
     let mut missing_punctuation = Vec::new();
     let mut current_paragraph = None;
+    let mut current_event_is_missing_punctuation = false;
 
     for (event, offset) in
         Parser::new_ext(doc_string, main_body_opts() - Options::ENABLE_SMART_PUNCTUATION).into_offset_iter()
     {
+        let last_event_was_missing_punctuation = current_event_is_missing_punctuation;
+        current_event_is_missing_punctuation = false;
+
         match event {
-            Event::Start(
-                Tag::CodeBlock(..)
-                | Tag::FootnoteDefinition(_)
-                | Tag::Heading { .. }
-                | Tag::HtmlBlock
-                | Tag::List(..)
-                | Tag::Table(_),
-            ) => {
+            Event::Start(Tag::FootnoteDefinition(_) | Tag::Heading { .. } | Tag::HtmlBlock | Tag::Table(_)) => {
                 no_report_depth += 1;
             },
+            Event::Start(Tag::CodeBlock(..) | Tag::List(..)) => {
+                no_report_depth += 1;
+                if last_event_was_missing_punctuation {
+                    // Remove the error from the previous paragraph as it is followed by a code
+                    // block or a list.
+                    missing_punctuation.pop();
+                }
+            },
             Event::End(TagEnd::FootnoteDefinition) => {
                 no_report_depth -= 1;
             },
@@ -83,6 +88,7 @@ fn is_missing_punctuation(doc_string: &str) -> Vec<MissingPunctuation> {
             Event::End(TagEnd::Paragraph) => {
                 if let Some(mp) = current_paragraph {
                     missing_punctuation.push(mp);
+                    current_event_is_missing_punctuation = true;
                 }
             },
             Event::Code(..) | Event::Start(Tag::Link { .. }) | Event::End(TagEnd::Link)

src/tools/clippy/clippy_lints/src/doc/doc_suspicious_footnotes.rs

@@ -91,7 +91,7 @@ pub fn check(cx: &LateContext<'_>, doc: &str, range: Range<usize>, fragments: &F
                             diag.span_suggestion_verbose(
                                 this_fragment.span.shrink_to_hi(),
                                 "add footnote definition",
-                                format!("\n\n{label}: <!-- description -->", label = &doc[start..end],),
+                                format!("\n\n{label}: <!-- description -->", label = &doc[start..end]),
                                 Applicability::HasPlaceholders,
                             );
                         } else {