objdiff-cli diff: Click-to-highlight & build fixes

objdiff-gui/src/app.rs

@@ -12,11 +12,8 @@ use std::{
 use filetime::FileTime;
 use globset::{Glob, GlobSet};
 use notify::{RecursiveMode, Watcher};
-use objdiff_core::{
-    config::{
-        build_globset, ProjectConfigInfo, ProjectObject, ScratchConfig, DEFAULT_WATCH_PATTERNS,
-    },
-    diff::DiffAlg,
+use objdiff_core::config::{
+    build_globset, ProjectConfigInfo, ProjectObject, ScratchConfig, DEFAULT_WATCH_PATTERNS,
 };
 use time::UtcOffset;
 
@@ -29,9 +26,7 @@ use crate::{
     },
     views::{
         appearance::{appearance_window, Appearance},
-        config::{
-            config_ui, diff_options_window, project_window, ConfigViewState, CONFIG_DISABLED_TEXT,
-        },
+        config::{config_ui, project_window, ConfigViewState, CONFIG_DISABLED_TEXT},
         data_diff::data_diff_ui,
         debug::debug_window,
         demangle::{demangle_window, DemangleViewState},
@@ -529,7 +524,6 @@ impl eframe::App for App {
         project_window(ctx, config, show_project_config, config_state, appearance);
         appearance_window(ctx, show_appearance_config, appearance);
         demangle_window(ctx, show_demangle, demangle_state, appearance);
-        diff_options_window(ctx, config, show_diff_options, appearance);
         debug_window(ctx, show_debug, frame_history, appearance);
 
         self.post_update(ctx);

objdiff-gui/src/jobs/objdiff.rs

@@ -7,7 +7,7 @@ use std::{
 
 use anyhow::{anyhow, Context, Error, Result};
 use objdiff_core::{
-    diff::{diff_objs, DiffAlg, DiffObjConfig},
+    diff::{diff_objs, DiffObjConfig},
     obj::{elf, ObjInfo},
 };
 use time::OffsetDateTime;

objdiff-gui/src/views/config.rs

@@ -11,7 +11,7 @@ use anyhow::{Context, Result};
 use const_format::formatcp;
 use egui::{
     output::OpenUrl, text::LayoutJob, CollapsingHeader, FontFamily, FontId, RichText,
-    SelectableLabel, TextFormat, Widget, WidgetText,
+    SelectableLabel, TextFormat, Widget,
 };
 use globset::Glob;
 use objdiff_core::config::{ProjectObject, DEFAULT_WATCH_PATTERNS};
@@ -838,15 +838,3 @@ fn split_obj_config_ui(
         }
     });
 }
-
-pub fn diff_options_window(
-    ctx: &egui::Context,
-    config: &AppConfigRef,
-    show: &mut bool,
-    appearance: &Appearance,
-) {
-    let mut config_guard = config.write().unwrap();
-    egui::Window::new("Diff Options").open(show).show(ctx, |ui| {
-        diff_options_ui(ui, &mut config_guard, appearance);
-    });
-}

objdiff-gui/src/views/function_diff.rs

@@ -247,7 +247,7 @@ fn asm_row_ui(
     let space_width = ui.fonts(|f| f.glyph_width(&appearance.code_font, ' '));
     display_diff(ins_diff, symbol.address as u32, |text| {
         diff_text_ui(ui, text, ins_diff, appearance, ins_view_state, space_width);
-        Ok(())
+        Ok::<_, ()>(())
     })
     .unwrap();
 }