Upgrade all dependencies (incl. egui)

This commit is contained in:
2025-11-18 22:21:46 -07:00
parent b2dcecc5d8
commit 827f4a42bd
12 changed files with 787 additions and 764 deletions

View File

@@ -30,9 +30,9 @@ 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"
@@ -40,21 +40,21 @@ 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",

View File

@@ -14,6 +14,7 @@ mod views;
use std::{
ffi::OsStr,
fmt::Display,
io::Cursor,
path::PathBuf,
process::ExitCode,
rc::Rc,
@@ -21,7 +22,7 @@ use std::{
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);

View File

@@ -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),

View File

@@ -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)