From 5f48e69775a6b7254df5da6c5aa4b49832a251bf Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 7 Jul 2025 15:29:30 -0600 Subject: [PATCH] More clippy fixes --- objdiff-core/src/arch/mod.rs | 26 +++++++++------ objdiff-core/src/arch/ppc/flow_analysis.rs | 2 +- objdiff-core/src/arch/superh/mod.rs | 38 +++++++++++----------- objdiff-core/src/diff/display.rs | 2 +- objdiff-core/tests/common.rs | 2 +- objdiff-gui/src/app.rs | 2 +- objdiff-gui/src/views/config.rs | 2 +- 7 files changed, 40 insertions(+), 34 deletions(-) diff --git a/objdiff-core/src/arch/mod.rs b/objdiff-core/src/arch/mod.rs index ab1e527..413a4da 100644 --- a/objdiff-core/src/arch/mod.rs +++ b/objdiff-core/src/arch/mod.rs @@ -1,4 +1,10 @@ -use alloc::{borrow::Cow, boxed::Box, format, string::String, vec::Vec}; +use alloc::{ + borrow::Cow, + boxed::Box, + format, + string::{String, ToString}, + vec::Vec, +}; use core::{ ffi::CStr, fmt::{self, Debug}, @@ -50,14 +56,14 @@ pub enum DataType { impl fmt::Display for DataType { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - DataType::Int8 => write!(f, "Int8"), - DataType::Int16 => write!(f, "Int16"), - DataType::Int32 => write!(f, "Int32"), - DataType::Int64 => write!(f, "Int64"), - DataType::Float => write!(f, "Float"), - DataType::Double => write!(f, "Double"), - DataType::Bytes => write!(f, "Bytes"), - DataType::String => write!(f, "String"), + DataType::Int8 => f.write_str("Int8"), + DataType::Int16 => f.write_str("Int16"), + DataType::Int32 => f.write_str("Int32"), + DataType::Int64 => f.write_str("Int64"), + DataType::Float => f.write_str("Float"), + DataType::Double => f.write_str("Double"), + DataType::Bytes => f.write_str("Bytes"), + DataType::String => f.write_str("String"), } } } @@ -66,7 +72,7 @@ impl DataType { pub fn display_labels(&self, endian: object::Endianness, bytes: &[u8]) -> Vec { let mut strs = Vec::new(); for (literal, label_override) in self.display_literals(endian, bytes) { - let label = label_override.unwrap_or_else(|| format!("{self}")); + let label = label_override.unwrap_or_else(|| self.to_string()); strs.push(format!("{label}: {literal}")) } strs diff --git a/objdiff-core/src/arch/ppc/flow_analysis.rs b/objdiff-core/src/arch/ppc/flow_analysis.rs index 3edd402..dd84f74 100644 --- a/objdiff-core/src/arch/ppc/flow_analysis.rs +++ b/objdiff-core/src/arch/ppc/flow_analysis.rs @@ -625,7 +625,7 @@ fn generate_flow_analysis_result( Some(FlowAnalysisValue::Text(reg_name)) } Some(RegisterContent::Unknown) | Some(RegisterContent::Variable) => None, - Some(value) => Some(FlowAnalysisValue::Text(format!("{value}"))), + Some(value) => Some(FlowAnalysisValue::Text(value.to_string())), None => None, }; if let Some(analysis_value) = analysis_value { diff --git a/objdiff-core/src/arch/superh/mod.rs b/objdiff-core/src/arch/superh/mod.rs index ee8c373..0b98725 100644 --- a/objdiff-core/src/arch/superh/mod.rs +++ b/objdiff-core/src/arch/superh/mod.rs @@ -214,10 +214,10 @@ mod test { impl Display for InstructionPart<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - InstructionPart::Basic(s) => write!(f, "{}", s), - InstructionPart::Opcode(s, _o) => write!(f, "{} ", s), - InstructionPart::Arg(arg) => write!(f, "{}", arg), - InstructionPart::Separator => write!(f, ", "), + InstructionPart::Basic(s) => f.write_str(s), + InstructionPart::Opcode(s, _o) => write!(f, "{s} "), + InstructionPart::Arg(arg) => write!(f, "{arg}"), + InstructionPart::Separator => f.write_str(", "), } } } @@ -225,9 +225,9 @@ mod test { impl Display for InstructionArg<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - InstructionArg::Value(v) => write!(f, "{}", v), - InstructionArg::BranchDest(v) => write!(f, "{}", v), - InstructionArg::Reloc => write!(f, "reloc"), + InstructionArg::Value(v) => write!(f, "{v}"), + InstructionArg::BranchDest(v) => write!(f, "{v}"), + InstructionArg::Reloc => f.write_str("reloc"), } } } @@ -264,7 +264,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -342,7 +342,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -425,7 +425,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -462,7 +462,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -516,7 +516,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -557,7 +557,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -601,7 +601,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -645,7 +645,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -682,7 +682,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -716,7 +716,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -764,7 +764,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } @@ -814,7 +814,7 @@ mod test { ) .unwrap(); - let joined_str: String = parts.iter().map(|part| format!("{}", part)).collect(); + let joined_str: String = parts.iter().map(<_>::to_string).collect(); assert_eq!(joined_str, expected_str.to_string()); } } diff --git a/objdiff-core/src/diff/display.rs b/objdiff-core/src/diff/display.rs index 5ae4e78..99b678d 100644 --- a/objdiff-core/src/diff/display.rs +++ b/objdiff-core/src/diff/display.rs @@ -609,7 +609,7 @@ pub fn instruction_hover( out.push(HoverItem::Separator); for (literal, label_override) in literals { out.push(HoverItem::Text { - label: label_override.unwrap_or_else(|| format!("{ty}")), + label: label_override.unwrap_or_else(|| ty.to_string()), value: literal, color: HoverItemColor::Normal, }); diff --git a/objdiff-core/tests/common.rs b/objdiff-core/tests/common.rs index 7ea3500..311c622 100644 --- a/objdiff-core/tests/common.rs +++ b/objdiff-core/tests/common.rs @@ -20,7 +20,7 @@ pub fn display_diff( separator = true; } let DiffTextSegment { text, color, pad_to } = segment; - output.push_str(&format!("({:?}, {:?}, {:?})", text, color, pad_to)); + output.push_str(&format!("({text:?}, {color:?}, {pad_to:?})")); Ok(()) }) .unwrap(); diff --git a/objdiff-gui/src/app.rs b/objdiff-gui/src/app.rs index a500a32..8c6f324 100644 --- a/objdiff-gui/src/app.rs +++ b/objdiff-gui/src/app.rs @@ -542,7 +542,7 @@ impl App { Ok(()) => state.config_error = None, Err(e) => { log::error!("Failed to load project config: {e}"); - state.config_error = Some(format!("{e}")); + state.config_error = Some(e.to_string()); } } } diff --git a/objdiff-gui/src/views/config.rs b/objdiff-gui/src/views/config.rs index 22803e2..322de05 100644 --- a/objdiff-gui/src/views/config.rs +++ b/objdiff-gui/src/views/config.rs @@ -808,7 +808,7 @@ fn split_obj_config_ui( for (idx, glob) in state.config.watch_patterns.iter().enumerate() { ui.horizontal(|ui| { ui.label( - RichText::new(format!("{glob}")) + RichText::new(glob.to_string()) .color(appearance.text_color) .family(FontFamily::Monospace), );