From 04d16ac544d0e3b96eb4fd191a1f12bfbce2bcc3 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sat, 2 Mar 2024 17:33:46 -0500 Subject: [PATCH] remove two unnecessary string heap allocs Signed-off-by: strawberry --- Cargo.toml | 2 +- src/config/mod.rs | 3 ++- src/service/admin/mod.rs | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 42474427..7db31177 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -277,7 +277,7 @@ empty_drop = "warn" exit = "warn" filetype_is_file = "warn" float_cmp_const = "warn" -# format_push_string = "warn" +format_push_string = "warn" impl_trait_in_params = "warn" infinite_loop = "warn" # let_underscore_untyped = "warn" diff --git a/src/config/mod.rs b/src/config/mod.rs index 604da546..912982c4 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -1,6 +1,7 @@ use std::{ collections::BTreeMap, fmt, + fmt::Write as _, net::{IpAddr, Ipv4Addr}, path::PathBuf, }; @@ -398,7 +399,7 @@ impl fmt::Display for Config { let mut msg: String = "Active config values:\n\n".to_owned(); for line in lines.into_iter().enumerate() { - msg += &format!("{}: {}\n", line.1 .0, line.1 .1); + let _ = writeln!(msg, "{}: {}", line.1 .0, line.1 .1); } write!(f, "{msg}") diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs index 309e225c..f2267719 100644 --- a/src/service/admin/mod.rs +++ b/src/service/admin/mod.rs @@ -4,7 +4,7 @@ use std::{ time::Instant, }; -use std::fmt::Write; +use std::fmt::Write as _; use clap::{Parser, Subcommand}; use regex::Regex; @@ -1730,8 +1730,9 @@ impl Service { for (r, (e, i)) in map.iter() { let elapsed = i.elapsed(); - msg += &format!( - "{} {}: {}m{}s\n", + let _ = writeln!( + msg, + "{} {}: {}m{}s", r, e, elapsed.as_secs() / 60,