Update all dependencies (again)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "objdiff"
-version = "0.3.1"
+version = "0.3.3"
 edition = "2021"
 rust-version = "1.65"
 authors = ["Luke Street <luke@street.dev>"]
@@ -11,6 +11,7 @@ description = """
 A local diffing tool for decompilation projects.
 """
 publish = false
+build = "build.rs"
 
 [profile.release]
 lto = "thin"
@@ -21,40 +22,40 @@ default = []
 wgpu = ["eframe/wgpu"]
 
 [dependencies]
-anyhow = "1.0.68"
+anyhow = "1.0.71"
-bytes = "1.3.0"
+bytes = "1.4.0"
 cfg-if = "1.0.0"
-const_format = "0.2.30"
+const_format = "0.2.31"
 cwdemangle = "0.1.5"
-eframe = { version = "0.20.1", features = ["persistence"] }
+eframe = { version = "0.22.0", features = ["persistence"] }
-egui = "0.20.1"
+egui = "0.22.0"
-egui_extras = "0.20.0"
+egui_extras = "0.22.0"
 flagset = "0.4.3"
-log = "0.4.17"
+log = "0.4.19"
-memmap2 = "0.5.8"
+memmap2 = "0.7.1"
-notify = "5.0.0"
+notify = "6.0.1"
-object = { version = "0.30.2", features = ["read_core", "std", "elf"], default-features = false }
+object = { version = "0.31.1", features = ["read_core", "std", "elf"], default-features = false }
-png = "0.17.7"
+png = "0.17.9"
 ppc750cl = { git = "https://github.com/terorie/ppc750cl", rev = "9ae36eef34aa6d74e00972c7671f547a2acfd0aa" }
-rabbitizer = "1.5.8"
+rabbitizer = "1.7.4"
-rfd = { version = "0.10.0" } #, default-features = false, features = ['xdg-portal']
+rfd = { version = "0.11.4" } #, default-features = false, features = ['xdg-portal']
 serde = { version = "1", features = ["derive"] }
-tempfile = "3.3.0"
+tempfile = "3.6.0"
-thiserror = "1.0.38"
+thiserror = "1.0.41"
-time = { version = "0.3.17", features = ["formatting", "local-offset"] }
+time = { version = "0.3.22", features = ["formatting", "local-offset"] }
-toml = "0.5.11"
+toml = "0.7.6"
 twox-hash = "1.6.3"
 byteorder = "1.4.3"
 
 # For Linux static binaries, use rustls
 [target.'cfg(target_os = "linux")'.dependencies]
-reqwest = { version = "0.11.14", default-features = false, features = ["blocking", "json", "rustls"] }
+reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "json", "rustls"] }
-self_update = { version = "0.34.0", default-features = false, features = ["rustls"] }
+self_update = { version = "0.37.0", default-features = false, features = ["rustls"] }
 
 # For all other platforms, use native TLS
 [target.'cfg(not(target_os = "linux"))'.dependencies]
-reqwest = "0.11.14"
+reqwest = "0.11.18"
-self_update = "0.34.0"
+self_update = "0.37.0"
 
 [target.'cfg(windows)'.dependencies]
 path-slash = "0.2.1"
@@ -76,5 +77,5 @@ console_error_panic_hook = "0.1.7"
 tracing-wasm = "0.2"
 
 [build-dependencies]
-anyhow = "1.0.68"
+anyhow = "1.0.71"
-vergen = { version = "7.5.0", features = ["build", "cargo", "git"], default-features = false }
+vergen = { version = "8.2.4", features = ["build", "cargo", "git", "gitcl"] }

build.rs

@@ -1,10 +1,10 @@
 use anyhow::Result;
-use vergen::{vergen, Config};
+use vergen::EmitBuilder;
 
 fn main() -> Result<()> {
     #[cfg(windows)]
     {
         winres::WindowsResource::new().set_icon("assets/icon.ico").compile()?;
     }
-    vergen(Config::default())
+    EmitBuilder::builder().fail_on_error().all_build().all_cargo().all_git().emit()
 }

deny.toml

@@ -48,9 +48,11 @@ notice = "warn"
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
-    # git2 (build dependency)
+    "RUSTSEC-2023-0022",
-    "RUSTSEC-2023-0002",
+    "RUSTSEC-2023-0023",
-    "RUSTSEC-2023-0003",
+    "RUSTSEC-2023-0024",
+    "RUSTSEC-2023-0034",
+    "RUSTSEC-2023-0044",
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories
@@ -86,6 +88,7 @@ allow = [
     "OFL-1.1",
     "LicenseRef-UFL-1.0",
     "OpenSSL",
+    "GPL-3.0",
 ]
 # List of explictly disallowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses

src/app.rs

@@ -362,7 +362,7 @@ impl eframe::App for App {
                     ui.colored_label(Color32::LIGHT_BLUE, &demangled);
                 });
                 if ui.button("Copy").clicked() {
-                    ui.output().copied_text = demangled;
+                    ui.output_mut(|output| output.copied_text = demangled);
                 }
             } else {
                 ui.scope(|ui| {
@@ -481,7 +481,7 @@ impl eframe::App for App {
                 if let Some(project_dir) = &config.project_dir {
                     match create_watcher(self.modified.clone(), project_dir) {
                         Ok(watcher) => self.watcher = Some(watcher),
-                        Err(e) => eprintln!("Failed to create watcher: {e}"),
+                        Err(e) => log::error!("Failed to create watcher: {e}"),
                     }
                     config.project_dir_change = false;
                     self.modified.store(true, Ordering::Relaxed);
@@ -532,7 +532,7 @@ fn create_watcher(
                     }
                 }
             }
-            Err(e) => println!("watch error: {e:?}"),
+            Err(e) => log::error!("watch error: {e:?}"),
         })?;
     watcher.watch(project_dir, RecursiveMode::Recursive)?;
     Ok(watcher)

src/editops.rs

@@ -76,18 +76,15 @@ where T: PartialEq {
             cache_matrix[current + 1 + p] = x;
         }
     }
-    editops_from_cost_matrix::<T>(matrix_columns, matrix_rows, prefix_len, cache_matrix)
+    editops_from_cost_matrix(matrix_columns, matrix_rows, prefix_len, cache_matrix)
 }
 
-fn editops_from_cost_matrix<T>(
+fn editops_from_cost_matrix(
     len1: usize,
     len2: usize,
     prefix_len: usize,
     cache_matrix: Vec<usize>,
-) -> Vec<LevEditOp>
+) -> Vec<LevEditOp> {
-where
-    T: PartialEq,
-{
     let mut ops = Vec::with_capacity(cache_matrix[len1 * len2 - 1]);
     let mut dir = 0;
     let mut i = len1 - 1;

src/main.rs

@@ -54,7 +54,8 @@ fn main() {
         "objdiff",
         native_options,
         Box::new(move |cc| Box::new(objdiff::App::new(cc, utc_offset, exec_path_clone))),
-    );
+    )
+    .expect("Failed to run eframe application");
 
     // Attempt to relaunch application from the updated path
     if let Ok(mut guard) = exec_path.lock() {
@@ -64,7 +65,7 @@ fn main() {
                     let result = exec::Command::new(path)
                         .args(&std::env::args().collect::<Vec<String>>())
                         .exec();
-                    eprintln!("Failed to relaunch: {result:?}");
+                    log::error!("Failed to relaunch: {result:?}");
                 } else {
                     let result = std::process::Command::new(path)
                         .args(std::env::args())
@@ -72,7 +73,7 @@ fn main() {
                         .unwrap()
                         .wait();
                     if let Err(e) = result {
-                        eprintln!("Failed to relaunch: {:?}", e);
+                        log::error!("Failed to relaunch: {:?}", e);
                     }
                 }
             }

src/obj/elf.rs

@@ -26,7 +26,7 @@ fn to_obj_section_kind(kind: SectionKind) -> Option<ObjSectionKind> {
 fn to_obj_symbol(obj_file: &File<'_>, symbol: &Symbol<'_, '_>, addend: i64) -> Result<ObjSymbol> {
     let mut name = symbol.name().context("Failed to process symbol name")?;
     if name.is_empty() {
-        println!("Found empty sym: {symbol:?}");
+        log::warn!("Found empty sym: {symbol:?}");
         name = "?";
     }
     let mut flags = ObjSymbolFlagSet(ObjSymbolFlags::none());
@@ -126,7 +126,8 @@ fn symbols_by_section(obj_file: &File<'_>, section: &ObjSection) -> Result<Vec<O
 }
 
 fn common_symbols(obj_file: &File<'_>) -> Result<Vec<ObjSymbol>> {
-    obj_file.symbols()
+    obj_file
+        .symbols()
         .filter(Symbol::is_common)
         .map(|symbol| to_obj_symbol(obj_file, &symbol, 0))
         .collect::<Result<Vec<ObjSymbol>>>()
@@ -293,7 +294,7 @@ fn line_info(obj_file: &File<'_>) -> Result<Option<BTreeMap<u32, u32>>> {
             let address_delta = reader.read_u32::<BigEndian>()?;
             map.insert(base_address + address_delta, line_number);
         }
-        println!("Line info: {map:#X?}");
+        log::debug!("Line info: {map:#X?}");
         return Ok(Some(map));
     }
     Ok(None)

src/views/config.rs

@@ -74,7 +74,7 @@ pub fn config_ui(ui: &mut egui::Ui, config: &Arc<RwLock<AppConfig>>, view_state:
         ui.label(formatcp!("Git branch: {}", env!("VERGEN_GIT_BRANCH")));
         ui.label(formatcp!("Git commit: {}", env!("VERGEN_GIT_SHA")));
         ui.label(formatcp!("Build target: {}", env!("VERGEN_CARGO_TARGET_TRIPLE")));
-        ui.label(formatcp!("Build type: {}", env!("VERGEN_CARGO_PROFILE")));
+        ui.label(formatcp!("Debug: {}", env!("VERGEN_CARGO_DEBUG")));
     });
     if let Some(state) = &view_state.check_update {
         ui.label(format!("Latest version: {}", state.latest_release.version));
@@ -96,8 +96,10 @@ pub fn config_ui(ui: &mut egui::Ui, config: &Arc<RwLock<AppConfig>>, view_state:
                     .on_hover_text_at_pointer("Open a link to the latest release on GitHub")
                     .clicked()
                 {
-                    ui.output().open_url =
+                    ui.output_mut(|output| {
-                        Some(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true });
+                        output.open_url =
+                            Some(OpenUrl { url: RELEASE_URL.to_string(), new_tab: true })
+                    });
                 }
             });
         }

src/views/function_diff.rs

@@ -226,31 +226,31 @@ fn ins_context_menu(ui: &mut egui::Ui, ins: &ObjIns) {
                 match arg {
                     Argument::Uimm(v) => {
                         if ui.button(format!("Copy \"{v}\"")).clicked() {
-                            ui.output().copied_text = format!("{v}");
+                            ui.output_mut(|output| output.copied_text = format!("{v}"));
                             ui.close_menu();
                         }
                         if ui.button(format!("Copy \"{}\"", v.0)).clicked() {
-                            ui.output().copied_text = format!("{}", v.0);
+                            ui.output_mut(|output| output.copied_text = format!("{}", v.0));
                             ui.close_menu();
                         }
                     }
                     Argument::Simm(v) => {
                         if ui.button(format!("Copy \"{v}\"")).clicked() {
-                            ui.output().copied_text = format!("{v}");
+                            ui.output_mut(|output| output.copied_text = format!("{v}"));
                             ui.close_menu();
                         }
                         if ui.button(format!("Copy \"{}\"", v.0)).clicked() {
-                            ui.output().copied_text = format!("{}", v.0);
+                            ui.output_mut(|output| output.copied_text = format!("{}", v.0));
                             ui.close_menu();
                         }
                     }
                     Argument::Offset(v) => {
                         if ui.button(format!("Copy \"{v}\"")).clicked() {
-                            ui.output().copied_text = format!("{v}");
+                            ui.output_mut(|output| output.copied_text = format!("{v}"));
                             ui.close_menu();
                         }
                         if ui.button(format!("Copy \"{}\"", v.0)).clicked() {
-                            ui.output().copied_text = format!("{}", v.0);
+                            ui.output_mut(|output| output.copied_text = format!("{}", v.0));
                             ui.close_menu();
                         }
                     }
@@ -261,12 +261,12 @@ fn ins_context_menu(ui: &mut egui::Ui, ins: &ObjIns) {
         if let Some(reloc) = &ins.reloc {
             if let Some(name) = &reloc.target.demangled_name {
                 if ui.button(format!("Copy \"{name}\"")).clicked() {
-                    ui.output().copied_text = name.clone();
+                    ui.output_mut(|output| output.copied_text = name.clone());
                     ui.close_menu();
                 }
             }
             if ui.button(format!("Copy \"{}\"", reloc.target.name)).clicked() {
-                ui.output().copied_text = reloc.target.name.clone();
+                ui.output_mut(|output| output.copied_text = reloc.target.name.clone());
                 ui.close_menu();
             }
         }

src/views/jobs.rs

@@ -17,7 +17,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, view_state: &mut ViewState) {
                     if job.handle.is_some() {
                         job.should_remove = true;
                         if let Err(e) = job.cancel.send(()) {
-                            eprintln!("Failed to cancel job: {e:?}");
+                            log::error!("Failed to cancel job: {e:?}");
                         }
                     } else {
                         remove_job = Some(idx);

src/views/symbol_diff.rs

@@ -28,12 +28,12 @@ fn symbol_context_menu_ui(ui: &mut Ui, symbol: &ObjSymbol) {
 
         if let Some(name) = &symbol.demangled_name {
             if ui.button(format!("Copy \"{name}\"")).clicked() {
-                ui.output().copied_text = name.clone();
+                ui.output_mut(|output| output.copied_text = name.clone());
                 ui.close_menu();
             }
         }
         if ui.button(format!("Copy \"{}\"", symbol.name)).clicked() {
-            ui.output().copied_text = symbol.name.clone();
+            ui.output_mut(|output| output.copied_text = symbol.name.clone());
             ui.close_menu();
         }
     });
@@ -282,9 +282,9 @@ pub fn symbol_diff_ui(ui: &mut Ui, view_state: &mut ViewState) {
         strip.strip(|builder| {
             builder.sizes(Size::remainder(), 2).horizontal(|mut strip| {
                 strip.cell(|ui| {
-                    if result.first_status.success {
+                    ui.push_id("left", |ui| {
-                        if let Some(obj) = &result.first_obj {
+                        if result.first_status.success {
-                            ui.push_id("left", |ui| {
+                            if let Some(obj) = &result.first_obj {
                                 symbol_list_ui(
                                     ui,
                                     obj,
@@ -294,16 +294,16 @@ pub fn symbol_diff_ui(ui: &mut Ui, view_state: &mut ViewState) {
                                     &lower_search,
                                     &view_state.view_config,
                                 );
-                            });
+                            }
+                        } else {
+                            build_log_ui(ui, &result.first_status);
                         }
-                    } else {
+                    });
-                        build_log_ui(ui, &result.first_status);
-                    }
                 });
                 strip.cell(|ui| {
-                    if result.second_status.success {
+                    ui.push_id("right", |ui| {
-                        if let Some(obj) = &result.second_obj {
+                        if result.second_status.success {
-                            ui.push_id("right", |ui| {
+                            if let Some(obj) = &result.second_obj {
                                 symbol_list_ui(
                                     ui,
                                     obj,
@@ -313,11 +313,11 @@ pub fn symbol_diff_ui(ui: &mut Ui, view_state: &mut ViewState) {
                                     &lower_search,
                                     &view_state.view_config,
                                 );
-                            });
+                            }
+                        } else {
+                            build_log_ui(ui, &result.second_status);
                         }
-                    } else {
+                    });
-                        build_log_ui(ui, &result.second_status);
-                    }
                 });
             });
         });