encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-07-19 03:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

More clippy fixes

Browse Source
This commit is contained in:
Luke Street 2025-07-07 15:29:30 -06:00
parent 8756eee07b
commit 5f48e69775
7 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
objdiff-core/src/arch/mod.rs
View File

@ -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::{ use core::{
ffi::CStr, ffi::CStr,
fmt::{self, Debug}, fmt::{self, Debug},
@ -50,14 +56,14 @@ pub enum DataType {
impl fmt::Display for DataType { impl fmt::Display for DataType {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
DataType::Int8 => write!(f, "Int8"), DataType::Int8 => f.write_str("Int8"),
DataType::Int16 => write!(f, "Int16"), DataType::Int16 => f.write_str("Int16"),
DataType::Int32 => write!(f, "Int32"), DataType::Int32 => f.write_str("Int32"),
DataType::Int64 => write!(f, "Int64"), DataType::Int64 => f.write_str("Int64"),
DataType::Float => write!(f, "Float"), DataType::Float => f.write_str("Float"),
DataType::Double => write!(f, "Double"), DataType::Double => f.write_str("Double"),
DataType::Bytes => write!(f, "Bytes"), DataType::Bytes => f.write_str("Bytes"),
DataType::String => write!(f, "String"), DataType::String => f.write_str("String"),
} }
} }
} }
@ -66,7 +72,7 @@ impl DataType {
pub fn display_labels(&self, endian: object::Endianness, bytes: &[u8]) -> Vec<String> { pub fn display_labels(&self, endian: object::Endianness, bytes: &[u8]) -> Vec<String> {
let mut strs = Vec::new(); let mut strs = Vec::new();
for (literal, label_override) in self.display_literals(endian, bytes) { 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.push(format!("{label}: {literal}"))
} }
strs strs

2
objdiff-core/src/arch/ppc/flow_analysis.rs
View File

@ -625,7 +625,7 @@ fn generate_flow_analysis_result(
Some(FlowAnalysisValue::Text(reg_name)) Some(FlowAnalysisValue::Text(reg_name))
} }
Some(RegisterContent::Unknown) | Some(RegisterContent::Variable) => None, Some(RegisterContent::Unknown) | Some(RegisterContent::Variable) => None,
Some(value) => Some(FlowAnalysisValue::Text(format!("{value}"))), Some(value) => Some(FlowAnalysisValue::Text(value.to_string())),
None => None, None => None,
}; };
if let Some(analysis_value) = analysis_value { if let Some(analysis_value) = analysis_value {

38
objdiff-core/src/arch/superh/mod.rs
View File

@ -214,10 +214,10 @@ mod test {
impl Display for InstructionPart<'_> { impl Display for InstructionPart<'_> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
InstructionPart::Basic(s) => write!(f, "{}", s), InstructionPart::Basic(s) => f.write_str(s),
InstructionPart::Opcode(s, _o) => write!(f, "{} ", s), InstructionPart::Opcode(s, _o) => write!(f, "{s} "),
InstructionPart::Arg(arg) => write!(f, "{}", arg), InstructionPart::Arg(arg) => write!(f, "{arg}"),
InstructionPart::Separator => write!(f, ", "), InstructionPart::Separator => f.write_str(", "),
} }
} }
} }
@ -225,9 +225,9 @@ mod test {
impl Display for InstructionArg<'_> { impl Display for InstructionArg<'_> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
InstructionArg::Value(v) => write!(f, "{}", v), InstructionArg::Value(v) => write!(f, "{v}"),
InstructionArg::BranchDest(v) => write!(f, "{}", v), InstructionArg::BranchDest(v) => write!(f, "{v}"),
InstructionArg::Reloc => write!(f, "reloc"), InstructionArg::Reloc => f.write_str("reloc"),
} }
} }
} }
@ -264,7 +264,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -342,7 +342,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -425,7 +425,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -462,7 +462,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -516,7 +516,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -557,7 +557,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -601,7 +601,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -645,7 +645,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -682,7 +682,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -716,7 +716,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -764,7 +764,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }
@ -814,7 +814,7 @@ mod test {
) )
.unwrap(); .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()); assert_eq!(joined_str, expected_str.to_string());
} }
} }

2
objdiff-core/src/diff/display.rs
View File

@ -609,7 +609,7 @@ pub fn instruction_hover(
out.push(HoverItem::Separator); out.push(HoverItem::Separator);
for (literal, label_override) in literals { for (literal, label_override) in literals {
out.push(HoverItem::Text { out.push(HoverItem::Text {
label: label_override.unwrap_or_else(|| format!("{ty}")), label: label_override.unwrap_or_else(|| ty.to_string()),
value: literal, value: literal,
color: HoverItemColor::Normal, color: HoverItemColor::Normal,
}); });

2
objdiff-core/tests/common.rs
View File

@ -20,7 +20,7 @@ pub fn display_diff(
separator = true; separator = true;
} }
let DiffTextSegment { text, color, pad_to } = segment; let DiffTextSegment { text, color, pad_to } = segment;
output.push_str(&format!("({:?}, {:?}, {:?})", text, color, pad_to)); output.push_str(&format!("({text:?}, {color:?}, {pad_to:?})"));
Ok(()) Ok(())
}) })
.unwrap(); .unwrap();

2
objdiff-gui/src/app.rs
View File

@ -542,7 +542,7 @@ impl App {
Ok(()) => state.config_error = None, Ok(()) => state.config_error = None,
Err(e) => { Err(e) => {
log::error!("Failed to load project config: {e}"); log::error!("Failed to load project config: {e}");
state.config_error = Some(format!("{e}")); state.config_error = Some(e.to_string());
} }
} }
} }

2
objdiff-gui/src/views/config.rs
View File

@ -808,7 +808,7 @@ fn split_obj_config_ui(
for (idx, glob) in state.config.watch_patterns.iter().enumerate() { for (idx, glob) in state.config.watch_patterns.iter().enumerate() {
ui.horizontal(|ui| { ui.horizontal(|ui| {
ui.label( ui.label(
RichText::new(format!("{glob}")) RichText::new(glob.to_string())
.color(appearance.text_color) .color(appearance.text_color)
.family(FontFamily::Monospace), .family(FontFamily::Monospace),
); );