Upgrade all dependencies (incl. egui)

encounter · encounter · commit 827f4a42bd41 · 2025-11-18T22:21:46.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -75,6 +75,7 @@ ignore = [
     #{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" },
     { id = "RUSTSEC-2024-0436", reason = "Unmaintained paste crate is an indirect dependency" },
     { id = "RUSTSEC-2025-0052", reason = "Unmaintained async-std crate is an indirect dependency" },
+    { id = "RUSTSEC-2025-0119", reason = "Unmaintained number_prefix crate is an indirect dependency" },
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.
diff --git a/objdiff-cli/Cargo.toml b/objdiff-cli/Cargo.toml
@@ -16,19 +16,19 @@ publish = false
 anyhow = "1.0"
 argp = "0.4"
 crossterm = "0.29"
-enable-ansi-support = "0.2"
+enable-ansi-support = "0.3"
 memmap2 = "0.9"
 objdiff-core = { path = "../objdiff-core", features = ["all"] }
 prost = "0.14"
 ratatui = "0.29"
-rayon = "1.10"
+rayon = "1.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 supports-color = "3.0"
 time = { version = "0.3", features = ["formatting", "local-offset"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-typed-path = "0.11"
+typed-path = "0.12"
 
 [target.'cfg(target_env = "musl")'.dependencies]
 mimalloc = "0.1"
diff --git a/objdiff-cli/src/views/function_diff.rs b/objdiff-cli/src/views/function_diff.rs
@@ -378,7 +378,6 @@ impl UiView for FunctionDiffUi {
                     }
                     // Reload
                     KeyCode::Char('r') => {
-                        result.redraw = true;
                         return EventControlFlow::Reload;
                     }
                     // Scroll right
@@ -400,7 +399,6 @@ impl UiView for FunctionDiffUi {
                                 FunctionRelocDiffs::DataValue => FunctionRelocDiffs::All,
                                 FunctionRelocDiffs::All => FunctionRelocDiffs::None,
                             };
-                        result.redraw = true;
                         return EventControlFlow::Reload;
                     }
                     // Toggle three-way diff
diff --git a/objdiff-core/Cargo.toml b/objdiff-core/Cargo.toml
@@ -135,10 +135,10 @@ num-traits = { version = "0.2", default-features = false, optional = true }
 object = { version = "0.37", default-features = false, features = ["read_core", "elf", "coff"] }
 pbjson = { version = "0.8", default-features = false, optional = true }
 prost = { version = "0.14", default-features = false, features = ["derive"], optional = true }
-regex = { version = "1.11", default-features = false, features = [], optional = true }
+regex = { version = "1.12", default-features = false, features = [], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
 similar = { git = "https://github.com/encounter/similar.git", branch = "no_std", default-features = false, features = ["hashbrown"], optional = true }
-typed-path = { version = "0.11", default-features = false, optional = true }
+typed-path = { version = "0.12", default-features = false, optional = true }
 
 # config
 globset = { version = "0.4", default-features = false, optional = true }
@@ -155,29 +155,29 @@ powerpc = { version = "0.4", optional = true }
 rlwinmdec = { version = "1.1", optional = true }
 
 # mips
-rabbitizer = { version = "2.0.0-alpha.4", default-features = false, features = ["all_extensions"], optional = true }
+rabbitizer = { version = "2.0.0-alpha.7", default-features = false, features = ["all_extensions"], optional = true }
 
 # x86
 iced-x86 = { version = "1.21", default-features = false, features = ["decoder", "intel", "gas", "masm", "nasm", "exhaustive_enums", "no_std"], optional = true }
 
 # arm
-unarm = { version = "2.0", optional = true }
+unarm = { version = "2.1", optional = true }
 arm-attr = { version = "0.2", optional = true }
 
 # arm64
 yaxpeax-arch = { version = "0.3", default-features = false, optional = true }
 yaxpeax-arm = { version = "0.3", default-features = false, optional = true }
 
 # build
-notify = { version = "8.1.0", optional = true }
-notify-debouncer-full = { version = "0.5.0", optional = true }
+notify = { version = "8.2.0", optional = true }
+notify-debouncer-full = { version = "0.6.0", optional = true }
 shell-escape = { version = "0.1", optional = true }
-tempfile = { version = "3.20", optional = true }
+tempfile = { version = "3.23", optional = true }
 time = { version = "0.3", optional = true }
 encoding_rs = { version = "0.8.35", optional = true }
 
 # demangler
-cpp_demangle = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
+cpp_demangle = { version = "0.5", optional = true, default-features = false, features = ["alloc"] }
 cwdemangle = { version = "1.0", optional = true }
 gnuv2_demangle = { version = "0.4", optional = true }
 msvc-demangler = { version = "0.11", optional = true }
diff --git a/objdiff-core/src/diff/demangler.rs b/objdiff-core/src/diff/demangler.rs
@@ -34,9 +34,7 @@ impl Demangler {
 
     fn demangle_itanium(name: &str) -> Option<String> {
         let name = name.trim_start_matches('.');
-        cpp_demangle::Symbol::new(name)
-            .ok()
-            .and_then(|s| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())
+        cpp_demangle::Symbol::new(name).ok().and_then(|s| s.demangle().ok())
     }
 
     fn demangle_gnu_legacy(name: &str) -> Option<String> {
diff --git a/objdiff-gui/Cargo.toml b/objdiff-gui/Cargo.toml
@@ -30,31 +30,31 @@ cfg-if = "1.0"
 const_format = "0.2"
 cwdemangle = "1.0"
 dirs = "6.0"
-egui = "0.32"
-egui_extras = "0.32"
-egui-notify = "0.20"
+egui = "0.33"
+egui_extras = "0.33"
+egui-notify = "0.21"
 filetime = "0.2"
 float-ord = "0.3"
 font-kit = "0.14"
 globset = { version = "0.4", features = ["serde1"] }
 log = "0.4"
 objdiff-core = { path = "../objdiff-core", features = ["all"] }
 open = "5.3"
-png = "0.17"
+png = "0.18"
 pollster = "0.4"
-regex = "1.11"
+regex = "1.12"
 rfd = { version = "0.15" } #, default-features = false, features = ['xdg-portal']
 rlwinmdec = "1.1"
-ron = "0.10"
+ron = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 time = { version = "0.3", features = ["formatting", "local-offset"] }
-typed-path = "0.11"
+typed-path = "0.12"
 winit = { version = "0.30", features = ["default"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Keep version in sync with egui
 [dependencies.eframe]
-version = "0.32"
+version = "0.33"
 features = [
     "default_fonts",
     "glow",
@@ -66,7 +66,7 @@ default-features = false
 
 # Keep version in sync with eframe
 [dependencies.wgpu]
-version = "25.0"
+version = "27.0"
 features = [
     "dx12",
     "metal",
diff --git a/objdiff-gui/src/main.rs b/objdiff-gui/src/main.rs
@@ -14,14 +14,15 @@ mod views;
 use std::{
     ffi::OsStr,
     fmt::Display,
+    io::Cursor,
     path::PathBuf,
     process::ExitCode,
     rc::Rc,
     str::FromStr,
     sync::{Arc, Mutex},
 };
 
-use anyhow::{Result, ensure};
+use anyhow::{Context, Result, ensure};
 use argp::{FromArgValue, FromArgs};
 use cfg_if::cfg_if;
 use objdiff_core::config::path::check_path_buf;
@@ -90,9 +91,9 @@ struct TopLevel {
 }
 
 fn load_icon() -> Result<egui::IconData> {
-    let decoder = png::Decoder::new(include_bytes!("../assets/icon_64.png").as_ref());
+    let decoder = png::Decoder::new(Cursor::new(include_bytes!("../assets/icon_64.png").as_ref()));
     let mut reader = decoder.read_info()?;
-    let mut buf = vec![0; reader.output_buffer_size()];
+    let mut buf = vec![0; reader.output_buffer_size().context("Buffer too large")?];
     let info = reader.next_frame(&mut buf)?;
     ensure!(info.bit_depth == png::BitDepth::Eight);
     ensure!(info.color_type == png::ColorType::Rgba);
diff --git a/objdiff-gui/src/views/frame_history.rs b/objdiff-gui/src/views/frame_history.rs
@@ -104,7 +104,7 @@ impl FrameHistory {
             ));
             let cpu_usage = to_screen.inverse().transform_pos(pointer_pos).y;
             let text = format!("{:.1} ms", 1e3 * cpu_usage);
-            shapes.push(ui.fonts(|f| {
+            shapes.push(ui.fonts_mut(|f| {
                 Shape::text(
                     f,
                     pos2(rect.left(), y),
diff --git a/objdiff-gui/src/views/function_diff.rs b/objdiff-gui/src/views/function_diff.rs
@@ -217,7 +217,7 @@ fn asm_row_ui(
     if ins_diff.kind != InstructionDiffKind::None {
         ui.painter().rect_filled(ui.available_rect_before_wrap(), 0.0, ui.visuals().faint_bg_color);
     }
-    let space_width = ui.fonts(|f| f.glyph_width(&appearance.code_font, ' '));
+    let space_width = ui.fonts_mut(|f| f.glyph_width(&appearance.code_font, ' '));
     display_row(obj, symbol_idx, ins_diff, diff_config, |segment| {
         if let Some(action) =
             diff_text_ui(ui, segment, appearance, ins_view_state, column, space_width, &response_cb)
diff --git a/objdiff-wasm/Cargo.toml b/objdiff-wasm/Cargo.toml
@@ -22,8 +22,8 @@ std = ["objdiff-core/std"]
 
 [dependencies]
 log = { version = "0.4", default-features = false }
-regex = { version = "1.11", default-features = false, features = ["unicode-case"] }
-wit-bindgen = { version = "0.44", default-features = false, features = ["macros"] }
+regex = { version = "1.12", default-features = false, features = ["unicode-case"] }
+wit-bindgen = { version = "0.48", default-features = false, features = ["macros"] }
 xxhash-rust = { version = "0.8", default-features = false, features = ["xxh3"] }
 
 [dependencies.objdiff-core]
diff --git a/objdiff-wasm/src/api.rs b/objdiff-wasm/src/api.rs
@@ -469,16 +469,17 @@ impl From<obj::SymbolFlagSet> for SymbolFlags {
     fn from(flags: obj::SymbolFlagSet) -> SymbolFlags {
         let mut out = SymbolFlags::empty();
         for flag in flags {
-            out |= match flag {
-                obj::SymbolFlag::Global => SymbolFlags::GLOBAL,
-                obj::SymbolFlag::Local => SymbolFlags::LOCAL,
-                obj::SymbolFlag::Weak => SymbolFlags::WEAK,
-                obj::SymbolFlag::Common => SymbolFlags::COMMON,
-                obj::SymbolFlag::Hidden => SymbolFlags::HIDDEN,
-                obj::SymbolFlag::HasExtra => SymbolFlags::HAS_EXTRA,
-                obj::SymbolFlag::SizeInferred => SymbolFlags::SIZE_INFERRED,
-                obj::SymbolFlag::Ignored => SymbolFlags::IGNORED,
-            };
+            out = out
+                | match flag {
+                    obj::SymbolFlag::Global => SymbolFlags::GLOBAL,
+                    obj::SymbolFlag::Local => SymbolFlags::LOCAL,
+                    obj::SymbolFlag::Weak => SymbolFlags::WEAK,
+                    obj::SymbolFlag::Common => SymbolFlags::COMMON,
+                    obj::SymbolFlag::Hidden => SymbolFlags::HIDDEN,
+                    obj::SymbolFlag::HasExtra => SymbolFlags::HAS_EXTRA,
+                    obj::SymbolFlag::SizeInferred => SymbolFlags::SIZE_INFERRED,
+                    obj::SymbolFlag::Ignored => SymbolFlags::IGNORED,
+                };
         }
         out
     }

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ ignore = [`
`75`	`75`	`#{ crate = "[email protected]", reason = "you can specify why you are ignoring the yanked crate" },`
`76`	`76`	`{ id = "RUSTSEC-2024-0436", reason = "Unmaintained paste crate is an indirect dependency" },`
`77`	`77`	`{ id = "RUSTSEC-2025-0052", reason = "Unmaintained async-std crate is an indirect dependency" },`
	`78`	`+ { id = "RUSTSEC-2025-0119", reason = "Unmaintained number_prefix crate is an indirect dependency" },`
`78`	`79`	`]`
`79`	`80`	`# If this is true, then cargo deny will use the git executable to fetch advisory database.`
`80`	`81`	`# If this is false, then it uses a built-in git library.`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,6 @@ impl UiView for FunctionDiffUi {`
`378`	`378`	`}`
`379`	`379`	`// Reload`
`380`	`380`	`KeyCode::Char('r') => {`
`381`		`- result.redraw = true;`
`382`	`381`	`return EventControlFlow::Reload;`
`383`	`382`	`}`
`384`	`383`	`// Scroll right`
`@@ -400,7 +399,6 @@ impl UiView for FunctionDiffUi {`
`400`	`399`	`FunctionRelocDiffs::DataValue => FunctionRelocDiffs::All,`
`401`	`400`	`FunctionRelocDiffs::All => FunctionRelocDiffs::None,`
`402`	`401`	`};`
`403`		`- result.redraw = true;`
`404`	`402`	`return EventControlFlow::Reload;`
`405`	`403`	`}`
`406`	`404`	`// Toggle three-way diff`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@ impl Demangler {`
`34`	`34`
`35`	`35`	`fn demangle_itanium(name: &str) -> Option<String> {`
`36`	`36`	`let name = name.trim_start_matches('.');`
`37`		`- cpp_demangle::Symbol::new(name)`
`38`		`- .ok()`
`39`		`- .and_then(\|s\| s.demangle(&cpp_demangle::DemangleOptions::default()).ok())`
	`37`	`+ cpp_demangle::Symbol::new(name).ok().and_then(\|s\| s.demangle().ok())`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`fn demangle_gnu_legacy(name: &str) -> Option<String> {`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ fn asm_row_ui(`
`217`	`217`	`if ins_diff.kind != InstructionDiffKind::None {`
`218`	`218`	`ui.painter().rect_filled(ui.available_rect_before_wrap(), 0.0, ui.visuals().faint_bg_color);`
`219`	`219`	`}`
`220`		`- let space_width = ui.fonts(\|f\| f.glyph_width(&appearance.code_font, ' '));`
	`220`	`+ let space_width = ui.fonts_mut(\|f\| f.glyph_width(&appearance.code_font, ' '));`
`221`	`221`	`display_row(obj, symbol_idx, ins_diff, diff_config, \|segment\| {`
`222`	`222`	`if let Some(action) =`
`223`	`223`	`diff_text_ui(ui, segment, appearance, ins_view_state, column, space_width, &response_cb)`