encounter/objdiff
1
0
Fork 0
mirror of https://github.com/encounter/objdiff.git synced 2025-12-08 21:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy fixes & version bump

Browse Source
This commit is contained in:
Luke Street
2025-07-07 14:56:41 -06:00
parent bd3ed0d5ad
commit 8756eee07b
29 changed files with 89 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
objdiff-gui/src/fonts/mod.rs
View File

@@ -25,7 +25,7 @@ pub fn load_font_family(
) -> Option<LoadedFontFamily> {
let family_handle = source.select_family_by_name(name).ok()?;
if family_handle.fonts().is_empty() {
log::warn!("No fonts found for family '{}'", name);
log::warn!("No fonts found for family '{name}'");
return None;
}
let handles = family_handle.fonts().to_vec();
@@ -34,7 +34,7 @@ pub fn load_font_family(
match font_kit::loaders::default::Font::from_handle(handle) {
Ok(font) => loaded.push(font),
Err(err) => {
log::warn!("Failed to load font '{}': {}", name, err);
log::warn!("Failed to load font '{name}': {err}");
return None;
}
}
@@ -89,7 +89,7 @@ pub fn load_font_if_needed(
egui::FontFamily::Name(v) => v,
};
let family = load_font_family(source, family_name)
.with_context(|| format!("Failed to load font family '{}'", family_name))?;
.with_context(|| format!("Failed to load font family '{family_name}'"))?;
let default_fonts = fonts.families.get(&base_family).cloned().unwrap_or_default();
// FIXME clean up
let default_font_ref = family.fonts.get(family.default_index).unwrap();

8
objdiff-gui/src/views/appearance.rs
View File

@@ -141,7 +141,7 @@ impl Appearance {
) {
Ok(()) => self.ui_font = next_ui_font,
Err(e) => {
log::error!("Failed to load font: {}", e)
log::error!("Failed to load font: {e}")
}
}
}
@@ -155,7 +155,7 @@ impl Appearance {
) {
Ok(()) => self.code_font = next_code_font,
Err(e) => {
log::error!("Failed to load font: {}", e)
log::error!("Failed to load font: {e}")
}
}
}
@@ -172,7 +172,7 @@ impl Appearance {
) {
Ok(_) => {}
Err(e) => {
log::error!("Failed to load font: {}", e);
log::error!("Failed to load font: {e}");
// Revert to default
self.ui_font = DEFAULT_UI_FONT;
}
@@ -186,7 +186,7 @@ impl Appearance {
) {
Ok(_) => {}
Err(e) => {
log::error!("Failed to load font: {}", e);
log::error!("Failed to load font: {e}");
// Revert to default
self.code_font = DEFAULT_CODE_FONT;
}

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

@@ -380,7 +380,7 @@ fn object_context_ui(ui: &mut egui::Ui, object: &ObjectConfig) {
.on_hover_text("Open the source file in the default editor")
.clicked()
{
log::info!("Opening file {}", source_path);
log::info!("Opening file {source_path}");
if let Err(e) = open::that_detached(source_path.as_str()) {
log::error!("Failed to open source file: {e}");
}
@@ -509,7 +509,7 @@ fn format_path(path: &Option<Utf8PlatformPathBuf>, appearance: &Appearance) -> R
.and_then(|home| check_path_buf(home).ok())
.and_then(|home| dir.strip_prefix(&home).ok())
{
format!("~{}{}", MAIN_SEPARATOR, rel)
format!("~{MAIN_SEPARATOR}{rel}")
} else {
dir.to_string()
}
@@ -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(format!("{glob}"))
.color(appearance.text_color)
.family(FontFamily::Monospace),
);

4
objdiff-gui/src/views/diff.rs
View File

@@ -390,14 +390,14 @@ pub fn diff_view_ui(
let mut needs_separator = false;
if let Some(match_percent) = symbol_diff.match_percent {
let response = ui.label(
RichText::new(format!("{:.2}%", match_percent))
RichText::new(format!("{match_percent:.2}%"))
.font(appearance.code_font.clone())
.color(match_color_for_symbol(match_percent, appearance)),
);
if let Some((diff_score, max_score)) = symbol_diff.diff_score {
response.on_hover_ui_at_pointer(|ui| {
ui.label(
RichText::new(format!("Score: {}/{}", diff_score, max_score))
RichText::new(format!("Score: {diff_score}/{max_score}"))
.font(appearance.code_font.clone())
.color(appearance.text_color),
);

6
objdiff-gui/src/views/function_diff.rs
View File

@@ -146,17 +146,17 @@ fn diff_text_ui(
let label_text = match segment.text {
DiffText::Basic(text) => text.to_string(),
DiffText::Line(num) => format!("{num} "),
DiffText::Address(addr) => format!("{:x}:", addr),
DiffText::Address(addr) => format!("{addr:x}:"),
DiffText::Opcode(mnemonic, _op) => format!("{mnemonic} "),
DiffText::Argument(arg) => match arg {
InstructionArgValue::Signed(v) => format!("{:#x}", ReallySigned(v)),
InstructionArgValue::Unsigned(v) => format!("{:#x}", v),
InstructionArgValue::Unsigned(v) => format!("{v:#x}"),
InstructionArgValue::Opaque(v) => v.into_owned(),
},
DiffText::BranchDest(addr) => format!("{addr:x}"),
DiffText::Symbol(sym) => sym.demangled_name.as_ref().unwrap_or(&sym.name).clone(),
DiffText::Addend(addend) => match addend.cmp(&0i64) {
Ordering::Greater => format!("+{:#x}", addend),
Ordering::Greater => format!("+{addend:#x}"),
Ordering::Less => format!("-{:#x}", -addend),
_ => String::new(),
},

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

@@ -157,7 +157,7 @@ pub fn graphics_window(
state.should_relaunch = true;
}
Err(e) => {
log::error!("Failed to save graphics config: {:?}", e);
log::error!("Failed to save graphics config: {e:?}");
state.graphics_config.desired_backend = prev_backend;
}
}

8
objdiff-gui/src/views/jobs.rs
View File

@@ -37,7 +37,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
bar.ui(ui);
const STATUS_LENGTH: usize = 80;
if let Some(err) = &status.error {
let err_string = format!("{:#}", err);
let err_string = format!("{err:#}");
ui.colored_label(
appearance.delete_color,
if err_string.len() > STATUS_LENGTH - 10 {
@@ -119,7 +119,7 @@ pub fn jobs_menu_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appeara
}
Ordering::Greater => {
spinner.ui(ui);
clicked |= ui.link(format!("{} running", running_jobs)).clicked();
clicked |= ui.link(format!("{running_jobs} running")).clicked();
}
_ => (),
}
@@ -135,9 +135,7 @@ pub fn jobs_menu_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appeara
}
Ordering::Greater => {
clicked |= ui
.link(
RichText::new(format!("{} errors", error_jobs)).color(appearance.delete_color),
)
.link(RichText::new(format!("{error_jobs} errors")).color(appearance.delete_color))
.clicked();
}
_ => (),

8
objdiff-gui/src/views/symbol_diff.rs
View File

@@ -281,7 +281,7 @@ impl DiffViewState {
if let Some(source_path) =
state.config.selected_obj.as_ref().and_then(|obj| obj.source_path.as_ref())
{
log::info!("Opening file {}", source_path);
log::info!("Opening file {source_path}");
open::that_detached(source_path.as_str()).unwrap_or_else(|err| {
log::error!("Failed to open source file: {err}");
});
@@ -361,7 +361,11 @@ impl DiffViewState {
}
}
fn resolve_symbol(&self, symbol_idx: Option<usize>, column: usize) -> Option<ResolvedSymbol> {
fn resolve_symbol(
&self,
symbol_idx: Option<usize>,
column: usize,
) -> Option<ResolvedSymbol<'_>> {
let symbol_idx = symbol_idx?;
let result = self.build.as_deref()?;
let (obj, diff) = match column {