From e2a05a4257829fe166794e6081726e8a0594b1fb Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 28 Jun 2025 19:42:07 +0000 Subject: [PATCH 1/2] Allow new default clippy lint `uninlined-format-args` `clippy` recently added a new lint that encourages the use of variables directly in format strings rather than as positional arguments. While its not the most critical thing, its right, but fixing it everywhere is a few hundred changes and not entirely worth it right now. Instead, we simply allow the new default lint and hope to get to it at some point. --- ci/check-lint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/check-lint.sh b/ci/check-lint.sh index 2f16210e22c..12118643fc3 100755 --- a/ci/check-lint.sh +++ b/ci/check-lint.sh @@ -105,7 +105,8 @@ CLIPPY() { -A clippy::useless_conversion \ -A clippy::unnecessary_map_or `# to be removed once we hit MSRV 1.70` \ -A clippy::manual_repeat_n `# to be removed once we hit MSRV 1.86` \ - -A clippy::io_other_error `# to be removed once we hit MSRV 1.74` + -A clippy::io_other_error `# to be removed once we hit MSRV 1.74` \ + -A clippy::uninlined-format-args } CLIPPY From 622544b15f1b904a151db5677bfbde497b55ebbd Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 28 Jun 2025 21:09:14 +0000 Subject: [PATCH 2/2] Disable clippy's now-default `swap-with-temporary` buggy lint This lint fires when we do a swap with a value stored in a mutex, as it sees the `&mut x.lock().unwrap()` as a temporary which can be taken from, even though it is in fact not. See https://github.com/rust-lang/rust-clippy/issues/15166 --- ci/check-lint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/check-lint.sh b/ci/check-lint.sh index 12118643fc3..09b328008f6 100755 --- a/ci/check-lint.sh +++ b/ci/check-lint.sh @@ -10,6 +10,7 @@ CLIPPY() { `# Things where clippy is just wrong` \ -A clippy::unwrap-or-default \ -A clippy::upper_case_acronyms \ + -A clippy::swap-with-temporary \ `# Things where we do odd stuff on purpose ` \ -A clippy::unusual_byte_groupings \ -A clippy::unit_arg \