Clippy in Rust 1.88.0 (only) reported [1] up to the previous commit:
warning: variables can be used directly in the `format!` string
--> rust/macros/module.rs:112:23
|
112 | let content = format!("{param}:{content}", param = param,
content = content);
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
= note: `-W clippy::uninlined-format-args` implied by `-W clippy::all`
= help: to override `-W clippy::all` add
`#[allow(clippy::uninlined_format_args)]`
help: change this to
|
112 - let content = format!("{param}:{content}", param = param,
content = content);
112 + let content = format!("{param}:{content}");
The reason it only triggers in that version is that the lint was moved
from `pedantic` to `style` in Rust 1.88.0 and then back to `pedantic`
in Rust 1.89.0 [2][3].
In this case, the suggestion is fair and a pure simplification, thus
just apply it.
In addition, do the same for another place in the file that Clippy does
not report because it is multi-line.
Link:
https://lore.kernel.org/rust-for-linux/CANiq72=dratf3y_dz-2o4jb6az9j3yj4qywwnbrui4sm4aj...@mail.gmail.com/
[1]
Link: https://github.com/rust-lang/rust-clippy/pull/15287 [2]
Link: https://github.com/rust-lang/rust-clippy/issues/15151 [3]
Signed-off-by: Miguel Ojeda <[email protected]>
---
rust/macros/module.rs | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/rust/macros/module.rs b/rust/macros/module.rs
index e16298e520c7..06c18e207508 100644
--- a/rust/macros/module.rs
+++ b/rust/macros/module.rs
@@ -52,12 +52,7 @@ fn new(module: &'a str) -> Self {
fn emit_base(&mut self, field: &str, content: &str, builtin: bool, param:
bool) {
let string = if builtin {
// Built-in modules prefix their modinfo strings by `module.`.
- format!(
- "{module}.{field}={content}\0",
- module = self.module,
- field = field,
- content = content
- )
+ format!("{module}.{field}={content}\0", module = self.module)
} else {
// Loadable modules' modinfo strings go as-is.
format!("{field}={content}\0")
@@ -109,7 +104,7 @@ fn emit_internal(&mut self, field: &str, content: &str,
param: bool) {
}
fn emit_param(&mut self, field: &str, param: &str, content: &str) {
- let content = format!("{param}:{content}", param = param, content =
content);
+ let content = format!("{param}:{content}");
self.emit_internal(field, &content, true);
}
--
2.53.0
