Skip to content

Commit ee03d16

Browse files
committed
tacd: use variable names inside format! strings where possible
This was prompted by the newly introduced uninlined_format_args[1] clippy lint. [1]: https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
1 parent dc98cae commit ee03d16

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fn generate_build_date() {
9696
.unwrap()
9797
.as_secs();
9898

99-
println!("cargo:rustc-env=BUILD_TIMESTAMP={}", timestamp);
99+
println!("cargo:rustc-env=BUILD_TIMESTAMP={timestamp}");
100100
}
101101

102102
fn main() {

src/led/extras.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl Pattern for Leds {
142142
let brightness = (brightness * max).round();
143143
let duration = duration.as_millis();
144144

145-
write!(dst, "{} {} ", brightness, duration)
145+
write!(dst, "{brightness} {duration} ")
146146
.expect("Writing to a String should never fail");
147147

148148
dst

src/ui/screens/diagnostics.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn diagnostic_text(ui: &Ui) -> Result<String, std::fmt::Error> {
5555
writeln!(&mut text)?;
5656

5757
if let Some(tacd_version) = ui.res.system.tacd_version.try_get() {
58-
writeln!(&mut text, "v: {}", tacd_version)?;
58+
writeln!(&mut text, "v: {tacd_version}")?;
5959
}
6060

6161
if let Some(uname) = ui.res.system.uname.try_get() {
@@ -69,7 +69,7 @@ fn diagnostic_text(ui: &Ui) -> Result<String, std::fmt::Error> {
6969
HardwareGeneration::Gen3 => "Gen3",
7070
};
7171

72-
write!(&mut text, "generation: {} ", gen)?;
72+
write!(&mut text, "generation: {gen} ")?;
7373
}
7474

7575
if let Some(soc_temperature) = ui.res.temperatures.soc_temperature.try_get() {
@@ -116,12 +116,12 @@ fn diagnostic_text(ui: &Ui) -> Result<String, std::fmt::Error> {
116116
let powerboard_featureset = barebox.powerboard_featureset.join(",");
117117

118118
writeln!(&mut text, "barebox: {}", barebox.version)?;
119-
writeln!(&mut text, "baseboard ({}):", baseboard_release)?;
120-
writeln!(&mut text, "- bringup: {}", baseboard_timestamp)?;
121-
writeln!(&mut text, "- feat: {}", baseboard_featureset)?;
122-
writeln!(&mut text, "powerboard ({}):", powerboard_release)?;
123-
writeln!(&mut text, "- bringup: {}", powerboard_timestamp)?;
124-
writeln!(&mut text, "- feat: {}", powerboard_featureset)?;
119+
writeln!(&mut text, "baseboard ({baseboard_release}):")?;
120+
writeln!(&mut text, "- bringup: {baseboard_timestamp}")?;
121+
writeln!(&mut text, "- feat: {baseboard_featureset}")?;
122+
writeln!(&mut text, "powerboard ({powerboard_release}):")?;
123+
writeln!(&mut text, "- bringup: {powerboard_timestamp}")?;
124+
writeln!(&mut text, "- feat: {powerboard_featureset}")?;
125125
}
126126

127127
writeln!(&mut text)?;

src/ui/screens/system.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl ActivatableScreen for SystemScreen {
120120
row_anchor(3),
121121
Box::new(|ips: &Vec<String>| {
122122
let ip = ips.first().map(|s| s.as_str()).unwrap_or("-");
123-
format!("IP: {}", ip)
123+
format!("IP: {ip}")
124124
}),
125125
)
126126
});

0 commit comments

Comments
 (0)