Upgrade egui to 0.32 (#244)

### Checklist

* [x] I have read the [Contributor Guide](../CONTRIBUTING.md)
* [x] I have read and agree to the [Code of
Conduct](../CODE_OF_CONDUCT.md)
* [x] I have added a description of my changes and why I'd like them
included in the section below

### Description of Changes

Updated egui to 0.32 and fixed clippy warnings.

Author: globin

Cargo.lock

@@ -83,6 +83,7 @@ if_let_mutex = "warn"
 implicit_clone = "warn"
 implied_bounds_in_impls = "warn"
 imprecise_flops = "warn"
+indexing_slicing = "warn"
 index_refutable_slice = "warn"
 inefficient_to_string = "warn"
 infinite_loop = "warn"
@@ -119,12 +120,10 @@ map_err_ignore = "warn"
 map_flatten = "warn"
 map_unwrap_or = "warn"
 match_bool = "warn"
-match_on_vec_items = "warn"
 match_same_arms = "warn"
 match_wild_err_arm = "warn"
 match_wildcard_for_single_variants = "warn"
 mem_forget = "warn"
-mismatched_target_os = "warn"
 mismatching_type_param_order = "warn"
 missing_assert_message = "warn"
 missing_enforced_import_renames = "warn"

Cargo.toml

@@ -8,7 +8,7 @@ allow-unwrap-in-tests = true
 disallowed-methods = [
     # std functions
     { path = "std::env::var_os", reason = "use std::env::var and UTF-8 strings instead, including for paths" },
-    { path = "std::env::env_os", reason = "use std::env::var and UTF-8 strings instead, including for paths" },
+    { path = "std::env::vars_os", reason = "use std::env::var and UTF-8 strings instead, including for paths" },
     { path = "std::env::args_os", reason = "use std::env::var and UTF-8 strings instead, including for paths" },
     { path = "std::env::set_var", reason = "this is unsound in (at least) glibc, and its usage in multi-threaded programs is _heavily_ discouraged" },
     { path = "std::thread::spawn", reason = "spawn threads with std::thread::Builder instead to ensure they have a name specified" },

clippy.toml

@@ -22,8 +22,8 @@ include = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-egui = { version = "0.31.0", default-features = false }
-egui_extras = { version = "0.31.0", default-features = false, features = [
+egui = { version = "0.32.0", default-features = false }
+egui_extras = { version = "0.32.0", default-features = false, features = [
     "serde",
 ] }
 indexmap = { version = "2.1.0", features = ["serde"] }
@@ -41,7 +41,7 @@ vec1 = "1.8"
 web-time = "0.2"
 
 [dev-dependencies]
-eframe = { version = "0.31.0", default-features = false, features = [
+eframe = { version = "0.32.0", default-features = false, features = [
     "default_fonts",
     "glow",
     "persistence",

puffin_egui/Cargo.toml

@@ -781,20 +781,21 @@ fn paint_scope(
                 log_once::warn_once!("Missing scope metadata");
                 return Ok(PaintResult::Culled);
             };
-            egui::show_tooltip_at_pointer(
-                &info.ctx,
+            Tooltip::always_open(
+                info.ctx.clone(),
                 info.layer_id,
                 Id::new("puffin_profiler_tooltip"),
-                |ui| {
-                    paint_scope_details(ui, scope.id, scope.record.data, scope_details);
+                PopupAnchor::Pointer,
+            )
+            .show(|ui| {
+                paint_scope_details(ui, scope.id, scope.record.data, scope_details);
 
-                    ui.monospace(format!(
-                        "duration: {:7.3} ms",
-                        to_ms(scope.record.duration_ns)
-                    ));
-                    ui.monospace(format!("children: {num_children:3}"));
-                },
-            );
+                ui.monospace(format!(
+                    "duration: {:7.3} ms",
+                    to_ms(scope.record.duration_ns)
+                ));
+                ui.monospace(format!("children: {num_children:3}"));
+            });
         }
     }
 
@@ -846,14 +847,15 @@ fn paint_merge_scope(
         }
 
         if result == PaintResult::Hovered {
-            egui::show_tooltip_at_pointer(
-                &info.ctx,
+            Tooltip::always_open(
+                info.ctx.clone(),
                 info.layer_id,
                 Id::new("puffin_profiler_tooltip"),
-                |ui| {
-                    merge_scope_tooltip(ui, info.scope_collection, merge, info.num_frames);
-                },
-            );
+                PopupAnchor::Pointer,
+            )
+            .show(|ui| {
+                merge_scope_tooltip(ui, info.scope_collection, merge, info.num_frames);
+            });
         }
     }
 
@@ -886,7 +888,7 @@ fn paint_scope_details(ui: &mut Ui, scope_id: ScopeId, data: &str, scope_details
 
             if !data.is_empty() {
                 ui.monospace("data");
-                ui.monospace(egui::TextBuffer::as_str(&data));
+                ui.monospace(data);
                 ui.end_row();
             }
 

puffin_egui/src/flamegraph.rs

@@ -18,7 +18,7 @@ mod stats;
 
 pub use {egui, maybe_mut_ref::MaybeMutRef, puffin};
 
-use egui::*;
+use egui::{scroll_area::ScrollSource, *};
 use puffin::*;
 use std::{
     collections::{BTreeMap, BTreeSet},
@@ -544,9 +544,9 @@ impl ProfilerUi {
             let overhead_ms = num_scopes as f64 * 1.0e-6 * realistic_ns_overhead;
             if overhead_ms > 1.0 {
                 let overhead = if overhead_ms < 2.0 {
-                    format!("{:.1} ms", overhead_ms)
+                    format!("{overhead_ms:.1} ms")
                 } else {
-                    format!("{:.0} ms", overhead_ms)
+                    format!("{overhead_ms:.0} ms")
                 };
 
                 let text = format!(
@@ -628,7 +628,7 @@ impl ProfilerUi {
             Frame::dark_canvas(ui.style()).show(ui, |ui| {
                 egui::ScrollArea::horizontal()
                     .stick_to_right(true)
-                    .drag_to_scroll(false)
+                    .scroll_source(ScrollSource::SCROLL_BAR | ScrollSource::MOUSE_WHEEL)
                     .show(ui, |ui| {
                         let slowest_visible = self.show_frame_list(
                             ui,
@@ -750,14 +750,15 @@ impl ProfilerUi {
                 // preview when hovering is really annoying when viewing multiple frames
                 if is_hovered && !is_selected && !viewing_multiple_frames {
                     *hovered_frame = Some(frame.clone());
-                    egui::show_tooltip_at_pointer(
-                        ui.ctx(),
+                    Tooltip::always_open(
+                        ui.ctx().clone(),
                         ui.layer_id(),
                         Id::new("puffin_frame_tooltip"),
-                        |ui| {
-                            ui.label(format!("{:.1} ms", frame.duration_ns() as f64 * 1e-6));
-                        },
-                    );
+                        PopupAnchor::Pointer,
+                    )
+                    .show(|ui| {
+                        ui.label(format!("{:.1} ms", frame.duration_ns() as f64 * 1e-6));
+                    });
                 }
 
                 if response.dragged() {

puffin_egui/src/lib.rs

@@ -47,12 +47,12 @@ impl Client {
         let _: std::thread::JoinHandle<()> = std::thread::Builder::new()
             .name("http_client_thread".to_owned())
             .spawn(move || {
-                log::info!("Connecting to {}…", addr);
+                log::info!("Connecting to {addr}…");
                 while alive.load(SeqCst) {
                     match std::net::TcpStream::connect(&addr) {
                         Ok(mut stream) => {
                             *frame_view.lock() = FrameView::default();
-                            log::info!("Connected to {}", addr);
+                            log::info!("Connected to {addr}");
                             connected.store(true, SeqCst);
                             while alive.load(SeqCst) {
                                 match consume_message(&mut stream) {
@@ -73,7 +73,7 @@ impl Client {
                             }
                         }
                         Err(err) => {
-                            log::debug!("Failed to connect to {}: {}", addr, err);
+                            log::debug!("Failed to connect to {addr}: {err}");
                             std::thread::sleep(std::time::Duration::from_secs(1));
                         }
                     }

puffin_http/src/client.rs

@@ -263,11 +263,11 @@ impl Server {
 
                 while let Ok(frame) = rx.recv() {
                     if let Err(err) = server_impl.accept_new_clients() {
-                        log::warn!("puffin server failure: {}", err);
+                        log::warn!("puffin server failure: {err}");
                     }
 
                     if let Err(err) = server_impl.send(&frame) {
-                        log::warn!("puffin server failure: {}", err);
+                        log::warn!("puffin server failure: {err}");
                     }
                 }
             })
@@ -345,7 +345,7 @@ impl PuffinServerImpl {
                         .set_nonblocking(false)
                         .context("stream.set_nonblocking")?;
 
-                    log::info!("{} connected", client_addr);
+                    log::info!("{client_addr} connected");
 
                     let (packet_tx, packet_rx) = crossbeam_channel::bounded(MAX_FRAMES_IN_QUEUE);
 

puffin_http/src/server.rs

@@ -34,7 +34,7 @@ puffin_egui = { version = "0.29.0", path = "../puffin_egui", features = [
 puffin_http = { version = "0.16.1", path = "../puffin_http" }
 
 argh = "0.1"
-eframe = { version = "0.31.0", default-features = false, features = [
+eframe = { version = "0.32.0", default-features = false, features = [
     "default_fonts",
     "glow",
     "persistence",

puffin_viewer/Cargo.toml

@@ -153,7 +153,7 @@ impl PuffinViewer {
         }
 
         egui::TopBottomPanel::top("menu_bar").show(ctx, |ui| {
-            egui::menu::bar(ui, |ui| {
+            egui::MenuBar::new().ui(ui, |ui| {
                 egui::widgets::global_theme_preference_switch(ui);
 
                 ui.menu_button("File", |ui| {