Use new demangling logic on the "Demangle..." popup

Author: AngheloAlf

objdiff-gui/src/app.rs

@@ -20,7 +20,7 @@ use objdiff_core::{
         default_ignore_patterns, default_watch_patterns, path::platform_path_serde_option,
         save_project_config,
     },
-    diff::DiffObjConfig,
+    diff::{Demangler, DiffObjConfig},
     jobs::{Job, JobQueue, JobResult},
 };
 use time::UtcOffset;
@@ -811,7 +811,9 @@ impl eframe::App for App {
 
         project_window(ctx, state, show_project_config, config_state, appearance);
         appearance_window(ctx, show_appearance_config, appearance);
-        demangle_window(ctx, show_demangle, demangle_state, appearance);
+        let demangler =
+            state.read().map(|state| state.config.diff_obj_config.demangler).unwrap_or_default();
+        demangle_window(ctx, show_demangle, demangle_state, appearance, demangler);
         rlwinm_decode_window(ctx, show_rlwinm_decode, rlwinm_decode_state, appearance);
         arch_config_window(ctx, state, show_arch_config, appearance);
         debug_window(ctx, show_debug, frame_history, appearance);

objdiff-gui/src/views/demangle.rs

@@ -1,4 +1,5 @@
 use egui::TextStyle;
+use objdiff_core::diff::Demangler;
 
 use crate::views::appearance::Appearance;
 
@@ -12,11 +13,12 @@ pub fn demangle_window(
     show: &mut bool,
     state: &mut DemangleViewState,
     appearance: &Appearance,
+    demangler: Demangler,
 ) {
     egui::Window::new("Demangle").open(show).show(ctx, |ui| {
         ui.text_edit_singleline(&mut state.text);
         ui.add_space(10.0);
-        if let Some(demangled) = cwdemangle::demangle(&state.text, &Default::default()) {
+        if let Some(demangled) = demangler.demangle(&state.text) {
             ui.scope(|ui| {
                 ui.style_mut().override_text_style = Some(TextStyle::Monospace);
                 ui.colored_label(appearance.replace_color, &demangled);