Re: [PATCH 5/5] rust: clean Rust 1.88.0's `clippy::uninlined_format_args` lint
From: Benno Lossin
Date: Fri May 02 2025 - 14:50:07 EST
On Fri May 2, 2025 at 4:02 PM CEST, Miguel Ojeda wrote:
> Starting with Rust 1.88.0 (expected 2025-06-26) [1], `rustc` may move
> back the `uninlined_format_args` to `style` from `pedantic` (it was
> there waiting for rust-analyzer suppotr), and thus we will start to see
> lints like:
>
> warning: variables can be used directly in the `format!` string
> --> rust/macros/kunit.rs:105:37
> |
> 105 | let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{}", test);
> | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> |
> = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
> help: change this to
> |
> 105 - let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{}", test);
> 105 + let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{test}");
>
> There is even a case that is a pure removal:
>
> warning: variables can be used directly in the `format!` string
> --> rust/macros/module.rs:51:13
> |
> 51 | format!("{field}={content}\0", field = field, content = content)
> | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> |
> = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
> help: change this to
> |
> 51 - format!("{field}={content}\0", field = field, content = content)
> 51 + format!("{field}={content}\0")
>
> The lints all seem like nice cleanups, thus just apply them.
>
> We may want to disable `allow-mixed-uninlined-format-args` in the future.
>
> Cc: stable@xxxxxxxxxxxxxxx # Needed in 6.12.y and later (Rust is pinned in older LTSs).
> Cc: Benno Lossin <benno.lossin@xxxxxxxxx>
> Link: https://github.com/rust-lang/rust-clippy/pull/14160 [1]
> Signed-off-by: Miguel Ojeda <ojeda@xxxxxxxxxx>
For the pin-init modification:
Acked-by: Benno Lossin <lossin@xxxxxxxxxx>
---
Cheers,
Benno
> ---
> drivers/gpu/nova-core/gpu.rs | 2 +-
> rust/kernel/str.rs | 46 +++++++++++------------
> rust/macros/kunit.rs | 13 ++-----
> rust/macros/module.rs | 19 +++-------
> rust/macros/paste.rs | 2 +-
> rust/pin-init/internal/src/pinned_drop.rs | 3 +-
> 6 files changed, 35 insertions(+), 50 deletions(-)