update dependencies

Author: algorithmiker

Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.2"
 edition = "2024"
 
 [dependencies]
-mlua = { version = "0.10.5", features = ["error-send", "luajit"] }
+mlua = { version = "0.11.0", features = ["error-send", "luajit"] }
 entrace_core = { version = "0.1.1", path = "../entrace_core/" }
 anyhow = "1.0.100"
 memchr = "2.7.6"

entrace_query/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 clap = { version = "4.5.50", features = ["derive"] }
-mlua = { version = "0.10.5", features = ["error-send", "luajit"] }
+mlua = { version = "0.11.0", features = ["error-send", "luajit"] }
 entrace_query = { version = "0.1.1", path = "../entrace_query/" }
 entrace_core = { version = "0.1.1", path = "../entrace_core/" }
 anyhow = "1.0.100"

entrace_script/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-petgraph = "0.6"
+petgraph = "0.8"
 tracing = {version = "0.1"}
 tracing-appender = {version = "0.2.3" }
 tracing-subscriber = { version = "0.3", features = ["fmt", "json", "registry"]}

example/Cargo.toml

@@ -12,15 +12,15 @@ circular-buffer = "1.1.0"
 clap = { version = "4.5.40", features = ["derive"] }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
 directories = "6.0.0"
-eframe = "0.32.0"
-egui = "0.32.0"
-egui_extras = { version = "0.32.0", features = ["all_loaders"] }
-egui_material_icons = "0.4.0"
+eframe = "0.33.0"
+egui = "0.33.0"
+egui_extras = { version = "0.33.0", features = ["all_loaders"] }
+egui_material_icons = "0.5.0"
 entrace_core = { version = "0.1.1", path = "../entrace_core/" }
 entrace_query = { version = "0.1.1", path = "../entrace_query/" }
 memchr = "2.7.5"
 mimalloc = "0.1.47"
-mlua = { version = "0.10.5", features = ["error-send", "luajit"] }
+mlua = { version = "0.11.0", features = ["error-send", "luajit"] }
 notify = "8.0.0"
 rfd = "0.15.4"
 thiserror = "2.0.12"

flake.lock

@@ -9,7 +9,7 @@ use std::{
 use anyhow::Context;
 use clap::Parser;
 use egui::{
-    Color32, FontId, Margin, Pos2, Rect, RichText, Stroke, Theme, Ui,
+    Color32, Margin, Pos2, Rect, RichText, Stroke, Theme, Ui,
     epaint::text::{FontInsert, InsertFontFamily},
 };
 use entrace_core::{
@@ -30,6 +30,7 @@ use crate::{
     ephemeral_settings::EphemeralSettings,
     frame_time::{FrameTimeTracker, TrackFrameTime, us_to_human},
     notifications::{self, NotificationHandle, RefreshToken},
+    row_height_from_ctx,
     search::{self, LocatingState, SearchState, query_window::query_windows},
     self_tracing::SelfTracingState,
     settings::{self, SettingsDialogState, SettingsState, apply_settings},
@@ -281,7 +282,7 @@ impl eframe::App for App {
             });
         });
         if let LogStatus::Ready(log_state) = &self.log_status {
-            let font_size = ctx.fonts(|x| x.row_height(&FontId::monospace(FontId::default().size)));
+            let font_size = row_height_from_ctx(ctx);
             let text_field_margin = Margin::symmetric(4, 2);
             let text_field_size =
                 font_size * 2.0 + text_field_margin.topf() + text_field_margin.bottomf();

gui/Cargo.toml

@@ -17,7 +17,7 @@ use std::{
 };
 
 use egui::{
-    CollapsingHeader, Color32, Response, RichText, ScrollArea, TextStyle, Theme, Ui,
+    CollapsingHeader, Color32, FontId, Response, RichText, ScrollArea, TextStyle, Theme, Ui,
     epaint::RectShape, vec2,
 };
 use entrace_core::{LevelContainer, display_error_context};
@@ -306,6 +306,13 @@ fn span(
 }
 
 pub fn row_height(ui: &mut Ui) -> f32 {
-    ui.fonts(|x| x.row_height(&TextStyle::Body.resolve(ui.style())))
+    ui.fonts_mut(|x| x.row_height(&TextStyle::Body.resolve(ui.style())))
     //ui.fonts(|x| x.row_height(&FontId::default()))
 }
+
+pub fn row_height_from_ctx(ctx: &egui::Context) -> f32 {
+    // HACK: we can't use &TextStyle::Body.resolve(&ctx.style()) here, as it seems to run into a
+    // deadlock.
+    // Not sure what's the best way around this.
+    ctx.fonts_mut(|x| x.row_height(&FontId::default()))
+}

gui/src/app.rs

@@ -107,9 +107,9 @@ pub fn notifications(ui: &mut egui::Ui, app: &mut App) -> egui::InnerResponse<()
             let item_spacing = vec2(item_spacing.x * 0.5, item_spacing.y);
 
             let severity_galley =
-                ui.fonts(|x| x.layout_no_wrap(repr.0.to_string(), font_id.clone(), text_color));
-            let text_galley =
-                ui.fonts(|x| x.layout(notification.text.to_string(), font_id, text_color, 200.0));
+                ui.fonts_mut(|x| x.layout_no_wrap(repr.0.to_string(), font_id.clone(), text_color));
+            let text_galley = ui
+                .fonts_mut(|x| x.layout(notification.text.to_string(), font_id, text_color, 200.0));
             let severity_galley_size = severity_galley.size();
 
             let frame_width = (item_spacing.x + text_galley.size().x + item_spacing.x).max(100.0);