Auto merge of #155996 - flip1995:clippy-subtree-update, r=Manishearth

Clippy subtree update

r? Manishearth

Author: bors

src/bootstrap/src/core/build_steps/perf.rs

@@ -196,7 +196,7 @@ Consider setting `rust.debuginfo-level = 1` in `bootstrap.toml`."#);
             apply_shared_opts(&mut cmd, opts);
             cmd.run(builder);
 
-            println!("You can find the results at `{}`", &results_dir.display());
+            println!("You can find the results at `{}`", results_dir.display());
         }
         PerfCommand::Benchmark { id, opts } => {
             cmd.arg("bench_local");

src/bootstrap/src/core/build_steps/setup.rs

@@ -312,7 +312,7 @@ fn attempt_toolchain_link(builder: &Builder<'_>, stage_path: &str) {
         eprintln!(
             "To manually link stage 1 build to `stage1` toolchain, run:\n
             `rustup toolchain link stage1 {}`",
-            &stage_path
+            stage_path
         );
     }
 }

src/bootstrap/src/core/build_steps/test.rs

@@ -1349,9 +1349,9 @@ impl Step for Tidy {
     /// for the `dev` or `nightly` channels.
     fn run(self, builder: &Builder<'_>) {
         let mut cmd = builder.tool_cmd(Tool::Tidy);
-        cmd.arg(format!("--root-path={}", &builder.src.display()));
-        cmd.arg(format!("--cargo-path={}", &builder.initial_cargo.display()));
-        cmd.arg(format!("--output-dir={}", &builder.out.display()));
+        cmd.arg(format!("--root-path={}", builder.src.display()));
+        cmd.arg(format!("--cargo-path={}", builder.initial_cargo.display()));
+        cmd.arg(format!("--output-dir={}", builder.out.display()));
         // Tidy is heavily IO constrained. Still respect `-j`, but use a higher limit if `jobs` hasn't been configured.
         let jobs = builder.config.jobs.unwrap_or_else(|| {
             8 * std::thread::available_parallelism().map_or(1, std::num::NonZeroUsize::get) as u32
@@ -2576,7 +2576,7 @@ Please disable assertions with `rust.debug-assertions = false`.
 
             builder.info(&format!(
                 "Check compiletest suite={} mode={} compare_mode={} ({} -> {})",
-                suite, mode, compare_mode, &test_compiler.host, target
+                suite, mode, compare_mode, test_compiler.host, target
             ));
             let _time = helpers::timeit(builder);
             try_run_tests(builder, &mut cmd, false);

src/tools/clippy/.github/workflows/clippy_mq.yml

@@ -135,7 +135,7 @@ jobs:
         find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
 
     - name: Upload Binaries
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: binaries
         path: target/debug
@@ -179,7 +179,7 @@ jobs:
 
     # Download
     - name: Download target dir
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v8
       with:
         name: binaries
         path: target/debug

src/tools/clippy/.github/workflows/lintcheck.yml

@@ -44,7 +44,7 @@ jobs:
 
     - name: Cache lintcheck bin
       id: cache-lintcheck-bin
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: target/debug/lintcheck
         key: lintcheck-bin-${{ hashfiles('lintcheck/**') }}
@@ -59,7 +59,7 @@ jobs:
 
     - name: Cache results JSON
       id: cache-json
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: lintcheck-logs/ci_crates_logs.json
         key: ${{ steps.key.outputs.key }}
@@ -69,7 +69,7 @@ jobs:
       run: env CLIPPY_CONF_DIR="$PWD/lintcheck/ci-config" ./target/debug/lintcheck --format json --all-lints --crates-toml ./lintcheck/ci_crates.toml
 
     - name: Upload base JSON
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: base
         path: lintcheck-logs/ci_crates_logs.json
@@ -87,7 +87,7 @@ jobs:
 
     - name: Cache lintcheck bin
       id: cache-lintcheck-bin
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: target/debug/lintcheck
         key: lintcheck-bin-${{ hashfiles('lintcheck/**') }}
@@ -100,7 +100,7 @@ jobs:
       run: env CLIPPY_CONF_DIR="$PWD/lintcheck/ci-config" ./target/debug/lintcheck --format json --all-lints --crates-toml ./lintcheck/ci_crates.toml
 
     - name: Upload head JSON
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: head
         path: lintcheck-logs/ci_crates_logs.json
@@ -119,14 +119,14 @@ jobs:
         persist-credentials: false
 
     - name: Restore lintcheck bin
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: target/debug/lintcheck
         key: lintcheck-bin-${{ hashfiles('lintcheck/**') }}
         fail-on-cache-miss: true
 
     - name: Download JSON
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v8
 
     - name: Store PR number
       run: echo ${{ github.event.pull_request.number }} > pr.txt
@@ -140,13 +140,13 @@ jobs:
         ./target/debug/lintcheck diff {base,head}/ci_crates_logs.json --write-summary summary.json > full_diff.md
 
     - name: Upload full diff
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: full_diff
         path: full_diff.md
 
     - name: Upload summary
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: summary
         path: |

src/tools/clippy/.github/workflows/lintcheck_summary.yml

@@ -27,15 +27,15 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           name: summary
           path: untrusted
           run-id: ${{ github.event.workflow_run.id }}
           github-token: ${{ github.token }}
 
       - name: Format comment
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const fs = require("fs");

src/tools/clippy/CHANGELOG.md

@@ -6804,6 +6804,7 @@ Released 2018-09-13
 [`inline_asm_x86_att_syntax`]: https://rust-lang.github.io/rust-clippy/master/index.html#inline_asm_x86_att_syntax
 [`inline_asm_x86_intel_syntax`]: https://rust-lang.github.io/rust-clippy/master/index.html#inline_asm_x86_intel_syntax
 [`inline_fn_without_body`]: https://rust-lang.github.io/rust-clippy/master/index.html#inline_fn_without_body
+[`inline_modules`]: https://rust-lang.github.io/rust-clippy/master/index.html#inline_modules
 [`inspect_for_each`]: https://rust-lang.github.io/rust-clippy/master/index.html#inspect_for_each
 [`int_plus_one`]: https://rust-lang.github.io/rust-clippy/master/index.html#int_plus_one
 [`integer_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#integer_arithmetic
@@ -6878,6 +6879,7 @@ Released 2018-09-13
 [`main_recursion`]: https://rust-lang.github.io/rust-clippy/master/index.html#main_recursion
 [`manual_abs_diff`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_abs_diff
 [`manual_assert`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_assert
+[`manual_assert_eq`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_assert_eq
 [`manual_async_fn`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_async_fn
 [`manual_bits`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_bits
 [`manual_c_str_literals`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_c_str_literals
@@ -7393,6 +7395,7 @@ Released 2018-09-13
 [`used_underscore_items`]: https://rust-lang.github.io/rust-clippy/master/index.html#used_underscore_items
 [`useless_asref`]: https://rust-lang.github.io/rust-clippy/master/index.html#useless_asref
 [`useless_attribute`]: https://rust-lang.github.io/rust-clippy/master/index.html#useless_attribute
+[`useless_borrows_in_formatting`]: https://rust-lang.github.io/rust-clippy/master/index.html#useless_borrows_in_formatting
 [`useless_concat`]: https://rust-lang.github.io/rust-clippy/master/index.html#useless_concat
 [`useless_conversion`]: https://rust-lang.github.io/rust-clippy/master/index.html#useless_conversion
 [`useless_format`]: https://rust-lang.github.io/rust-clippy/master/index.html#useless_format

src/tools/clippy/book/src/configuration.md

@@ -79,7 +79,7 @@ This also works with lint groups. For example, you can run Clippy with warnings
 cargo clippy -- -W clippy::pedantic
 ```
 
-If you care only about a certain lints, you can allow all others and then explicitly warn on the lints you are
+If you care only about certain lints, you can allow all others and then explicitly warn on the lints you are
 interested in:
 
 ```terminal

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

@@ -502,7 +502,7 @@ fn setup_mod_file(path: &Path, lint: &LintData<'_>) -> io::Result<&'static str>
     file_contents.replace_range(arr_start + 1..arr_end, &new_arr_content);
 
     // Just add the mod declaration at the top, it'll be fixed by rustfmt
-    file_contents.insert_str(0, &format!("mod {};\n", &lint.name));
+    file_contents.insert_str(0, &format!("mod {};\n", lint.name));
 
     let mut file = OpenOptions::new()
         .write(true)

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

@@ -307,15 +307,15 @@ impl<'tcx> LateLintPass<'tcx> for ArbitrarySourceItemOrdering {
                 }
             },
             ItemKind::Trait {
-                impl_restriction:_,
-                constness:_,
+                impl_restriction: _,
+                constness: _,
                 is_auto,
-                safety:_,
-                ident:_,
+                safety: _,
+                ident: _,
                 generics: _,
                 bounds: _,
-                items: item_ref}
-             if self.enable_ordering_for_trait && *is_auto == IsAuto::No => {
+                items: 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 {