Skip to content

Commit f757ffc

Browse files
stravantstravant
committed
Merge branch 'multiple-text-sections' of https://github.com/stravant/objdiff into multiple-text-sections
2 parents eddece4 + d60a042 commit f757ffc

File tree

31 files changed

+126
-136
lines changed

31 files changed

+126
-136
lines changed

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ strip = "debuginfo"
1414
codegen-units = 1
1515

1616
[workspace.package]
17-
version = "3.0.0-beta.10"
17+
version = "3.0.0-beta.11"
1818
authors = ["Luke Street <[email protected]>"]
1919
edition = "2024"
2020
license = "MIT OR Apache-2.0"

‎objdiff-cli/src/cmd/diff.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,10 @@ fn run_oneshot(
203203
let output_format = OutputFormat::from_option(args.format.as_deref())?;
204204
let (diff_config, mapping_config) = build_config_from_args(args)?;
205205
let target = target_path
206-
.map(|p| {
207-
obj::read::read(p.as_ref(), &diff_config).with_context(|| format!("Loading {}", p))
208-
})
206+
.map(|p| obj::read::read(p.as_ref(), &diff_config).with_context(|| format!("Loading {p}")))
209207
.transpose()?;
210208
let base = base_path
211-
.map(|p| {
212-
obj::read::read(p.as_ref(), &diff_config).with_context(|| format!("Loading {}", p))
213-
})
209+
.map(|p| obj::read::read(p.as_ref(), &diff_config).with_context(|| format!("Loading {p}")))
214210
.transpose()?;
215211
let result =
216212
diff::diff_objs(target.as_ref(), base.as_ref(), None, &diff_config, &mapping_config)?;
@@ -399,7 +395,7 @@ fn run_interactive(
399395
stdout(),
400396
EnterAlternateScreen,
401397
EnableMouseCapture,
402-
SetTitle(format!("{} - objdiff", symbol_name)),
398+
SetTitle(format!("{symbol_name} - objdiff")),
403399
)?;
404400
let backend = CrosstermBackend::new(stdout());
405401
let mut terminal = Terminal::new(backend)?;

‎objdiff-cli/src/cmd/report.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,16 +177,14 @@ fn report_object(
177177
.target_path
178178
.as_ref()
179179
.map(|p| {
180-
obj::read::read(p.as_ref(), diff_config)
181-
.with_context(|| format!("Failed to open {}", p))
180+
obj::read::read(p.as_ref(), diff_config).with_context(|| format!("Failed to open {p}"))
182181
})
183182
.transpose()?;
184183
let base = object
185184
.base_path
186185
.as_ref()
187186
.map(|p| {
188-
obj::read::read(p.as_ref(), diff_config)
189-
.with_context(|| format!("Failed to open {}", p))
187+
obj::read::read(p.as_ref(), diff_config).with_context(|| format!("Failed to open {p}"))
190188
})
191189
.transpose()?;
192190
let result =
@@ -433,8 +431,8 @@ fn read_report(path: &Utf8PlatformPath) -> Result<Report> {
433431
std::io::stdin().read_to_end(&mut data)?;
434432
return Report::parse(&data).with_context(|| "Failed to load report from stdin");
435433
}
436-
let file = File::open(path).with_context(|| format!("Failed to open {}", path))?;
434+
let file = File::open(path).with_context(|| format!("Failed to open {path}"))?;
437435
let mmap =
438-
unsafe { memmap2::Mmap::map(&file) }.with_context(|| format!("Failed to map {}", path))?;
439-
Report::parse(mmap.as_ref()).with_context(|| format!("Failed to load report {}", path))
436+
unsafe { memmap2::Mmap::map(&file) }.with_context(|| format!("Failed to map {path}"))?;
437+
Report::parse(mmap.as_ref()).with_context(|| format!("Failed to load report {path}"))
440438
}

‎objdiff-cli/src/views/function_diff.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl UiView for FunctionDiffUi {
8787
.and_then(|(_, _, d)| d.match_percent)
8888
{
8989
line_r.spans.push(Span::styled(
90-
format!("{:.2}% ", percent),
90+
format!("{percent:.2}% "),
9191
Style::new().fg(match_percent_color(percent)),
9292
));
9393
}
@@ -97,7 +97,7 @@ impl UiView for FunctionDiffUi {
9797
.and_then(|t| t.format(&state.time_format).ok())
9898
.unwrap_or_else(|| "N/A".to_string());
9999
line_r.spans.push(Span::styled(
100-
format!("Last reload: {}", reload_time),
100+
format!("Last reload: {reload_time}"),
101101
Style::new().fg(Color::White),
102102
));
103103
line_r.spans.push(Span::styled(
@@ -538,15 +538,15 @@ impl FunctionDiffUi {
538538
let label_text = match segment.text {
539539
DiffText::Basic(text) => text.to_string(),
540540
DiffText::Line(num) => format!("{num} "),
541-
DiffText::Address(addr) => format!("{:x}:", addr),
541+
DiffText::Address(addr) => format!("{addr:x}:"),
542542
DiffText::Opcode(mnemonic, _op) => format!("{mnemonic} "),
543543
DiffText::Argument(arg) => arg.to_string(),
544544
DiffText::BranchDest(addr) => format!("{addr:x}"),
545545
DiffText::Symbol(sym) => {
546546
sym.demangled_name.as_ref().unwrap_or(&sym.name).clone()
547547
}
548548
DiffText::Addend(addend) => match addend.cmp(&0i64) {
549-
Ordering::Greater => format!("+{:#x}", addend),
549+
Ordering::Greater => format!("+{addend:#x}"),
550550
Ordering::Less => format!("-{:#x}", -addend),
551551
_ => String::new(),
552552
},

‎objdiff-core/config_gen.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ pub struct ConfigGroup {
6060
}
6161

6262
fn build_doc(name: &str, description: Option<&str>) -> TokenStream {
63-
let mut doc = format!(" {}", name);
63+
let mut doc = format!(" {name}");
6464
let mut out = quote! { #[doc = #doc] };
6565
if let Some(description) = description {
66-
doc = format!(" {}", description);
66+
doc = format!(" {description}");
6767
out.extend(quote! { #[doc = ""] });
6868
out.extend(quote! { #[doc = #doc] });
6969
}
@@ -443,9 +443,9 @@ pub fn generate_diff_config() {
443443
}
444444
impl core::fmt::Display for ConfigPropertyValue {
445445
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
446-
match self {
447-
ConfigPropertyValue::Boolean(value) => write!(f, "{}", value),
448-
ConfigPropertyValue::Choice(value) => write!(f, "{}", value),
446+
match *self {
447+
ConfigPropertyValue::Boolean(value) => write!(f, "{value}"),
448+
ConfigPropertyValue::Choice(value) => f.write_str(value),
449449
}
450450
}
451451
}

‎objdiff-core/src/arch/arm.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ fn push_args(
575575
arg_cb(InstructionPart::basic("}"))?;
576576
}
577577
args::Argument::CoprocNum(value) => {
578-
arg_cb(InstructionPart::opaque(format!("p{}", value)))?;
578+
arg_cb(InstructionPart::opaque(format!("p{value}")))?;
579579
}
580580
args::Argument::ShiftImm(shift) => {
581581
arg_cb(InstructionPart::opaque(shift.op.to_string()))?;

‎objdiff-core/src/arch/arm64.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2268,7 +2268,7 @@ where Cb: FnMut(InstructionPart<'static>) {
22682268
push_plain(args, "]");
22692269
push_separator(args);
22702270
// TODO does 31 have to be handled separate?
2271-
args(InstructionPart::opaque(format!("x{}", offset_reg)));
2271+
args(InstructionPart::opaque(format!("x{offset_reg}")));
22722272
}
22732273
// Fall back to original logic
22742274
Operand::SIMDRegister(_, _)

‎objdiff-core/src/arch/mod.rs‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
use alloc::{borrow::Cow, boxed::Box, format, string::String, vec::Vec};
1+
use alloc::{
2+
borrow::Cow,
3+
boxed::Box,
4+
format,
5+
string::{String, ToString},
6+
vec::Vec,
7+
};
28
use core::{
39
ffi::CStr,
410
fmt::{self, Debug},
@@ -50,14 +56,14 @@ pub enum DataType {
5056
impl fmt::Display for DataType {
5157
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
5258
match self {
53-
DataType::Int8 => write!(f, "Int8"),
54-
DataType::Int16 => write!(f, "Int16"),
55-
DataType::Int32 => write!(f, "Int32"),
56-
DataType::Int64 => write!(f, "Int64"),
57-
DataType::Float => write!(f, "Float"),
58-
DataType::Double => write!(f, "Double"),
59-
DataType::Bytes => write!(f, "Bytes"),
60-
DataType::String => write!(f, "String"),
59+
DataType::Int8 => f.write_str("Int8"),
60+
DataType::Int16 => f.write_str("Int16"),
61+
DataType::Int32 => f.write_str("Int32"),
62+
DataType::Int64 => f.write_str("Int64"),
63+
DataType::Float => f.write_str("Float"),
64+
DataType::Double => f.write_str("Double"),
65+
DataType::Bytes => f.write_str("Bytes"),
66+
DataType::String => f.write_str("String"),
6167
}
6268
}
6369
}
@@ -66,8 +72,8 @@ impl DataType {
6672
pub fn display_labels(&self, endian: object::Endianness, bytes: &[u8]) -> Vec<String> {
6773
let mut strs = Vec::new();
6874
for (literal, label_override) in self.display_literals(endian, bytes) {
69-
let label = label_override.unwrap_or_else(|| format!("{}", self));
70-
strs.push(format!("{}: {}", label, literal))
75+
let label = label_override.unwrap_or_else(|| self.to_string());
76+
strs.push(format!("{label}: {literal}"))
7177
}
7278
strs
7379
}
@@ -100,31 +106,31 @@ impl DataType {
100106
match self {
101107
DataType::Int8 => {
102108
let i = i8::from_ne_bytes(bytes.try_into().unwrap());
103-
strs.push((format!("{:#x}", i), None));
109+
strs.push((format!("{i:#x}"), None));
104110

105111
if i < 0 {
106112
strs.push((format!("{:#x}", ReallySigned(i)), None));
107113
}
108114
}
109115
DataType::Int16 => {
110116
let i = endian.read_i16_bytes(bytes.try_into().unwrap());
111-
strs.push((format!("{:#x}", i), None));
117+
strs.push((format!("{i:#x}"), None));
112118

113119
if i < 0 {
114120
strs.push((format!("{:#x}", ReallySigned(i)), None));
115121
}
116122
}
117123
DataType::Int32 => {
118124
let i = endian.read_i32_bytes(bytes.try_into().unwrap());
119-
strs.push((format!("{:#x}", i), None));
125+
strs.push((format!("{i:#x}"), None));
120126

121127
if i < 0 {
122128
strs.push((format!("{:#x}", ReallySigned(i)), None));
123129
}
124130
}
125131
DataType::Int64 => {
126132
let i = endian.read_i64_bytes(bytes.try_into().unwrap());
127-
strs.push((format!("{:#x}", i), None));
133+
strs.push((format!("{i:#x}"), None));
128134

129135
if i < 0 {
130136
strs.push((format!("{:#x}", ReallySigned(i)), None));
@@ -151,16 +157,16 @@ impl DataType {
151157
));
152158
}
153159
DataType::Bytes => {
154-
strs.push((format!("{:#?}", bytes), None));
160+
strs.push((format!("{bytes:#?}"), None));
155161
}
156162
DataType::String => {
157163
if let Ok(cstr) = CStr::from_bytes_until_nul(bytes) {
158-
strs.push((format!("{:?}", cstr), None));
164+
strs.push((format!("{cstr:?}"), None));
159165
}
160166
if let Some(nul_idx) = bytes.iter().position(|&c| c == b'\0') {
161167
let (cow, _, had_errors) = SHIFT_JIS.decode(&bytes[..nul_idx]);
162168
if !had_errors {
163-
let str = format!("{:?}", cow);
169+
let str = format!("{cow:?}");
164170
// Only add the Shift JIS string if it's different from the ASCII string.
165171
if !strs.iter().any(|x| x.0 == str) {
166172
strs.push((str, Some("Shift JIS".into())));

‎objdiff-core/src/arch/ppc/flow_analysis.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl core::fmt::Display for RegisterContent {
9292
// -i is safe because it's at most a 16 bit constant in the i32
9393
{
9494
if *i >= 0 {
95-
write!(f, "0x{:x}", i)
95+
write!(f, "0x{i:x}")
9696
} else {
9797
write!(f, "-0x{:x}", -i)
9898
}
@@ -625,7 +625,7 @@ fn generate_flow_analysis_result(
625625
Some(FlowAnalysisValue::Text(reg_name))
626626
}
627627
Some(RegisterContent::Unknown) | Some(RegisterContent::Variable) => None,
628-
Some(value) => Some(FlowAnalysisValue::Text(format!("{value}"))),
628+
Some(value) => Some(FlowAnalysisValue::Text(value.to_string())),
629629
None => None,
630630
};
631631
if let Some(analysis_value) = analysis_value {

0 commit comments

Comments
 (0)