Update to Rust 1.95 (#252)

* Bump toolchain, MSRV and CI to Rust 1.95.0
* Enable the workspace lints that are enabled in the main `egui` repo
but were missing here (`unexpected_cfgs`,
`rustdoc::broken_intra_doc_links`, and 14 clippy lints)
* Rename `clippy::empty_enum` -> `clippy::empty_enums` (renamed
upstream)

Only `clippy::ref_option` had hits. Fixing it changes
`PlotItem::on_hover`'s `label_formatter` parameter from
`&Option<LabelFormatter<'_>>` to `Option<&LabelFormatterFn<'_>>`, so
`LabelFormatterFn` is now public. Breaking for anyone implementing
`PlotItem` manually.

Lints that are stricter here than in `egui` (e.g. `expect_used`,
`too_many_lines`, `wildcard_imports`) were left as-is.

`./scripts/check.sh` passes.

* [x] I have followed the instructions in the PR template

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: emilk

.github/workflows/rust.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: default
-          toolchain: 1.92.0
+          toolchain: 1.95.0
           override: true
 
       - name: Install packages (Linux)
@@ -70,7 +70,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.92.0
+          toolchain: 1.95.0
           target: wasm32-unknown-unknown
           override: true
           components: clippy
@@ -95,7 +95,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
-          rust-version: "1.92.0"
+          rust-version: "1.95.0"
           log-level: warn
           command: check
 
@@ -109,7 +109,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.92.0
+          toolchain: 1.95.0
           target: wasm32-unknown-unknown
           override: true
       - name: Download and install Trunk binary
@@ -131,7 +131,7 @@ jobs:
           lfs: true
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.92.0
+          toolchain: 1.95.0
 
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2

Cargo.lock

@@ -867,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]

Cargo.toml

@@ -11,7 +11,7 @@ members = [
 [workspace.package]
 edition = "2024"
 license = "MIT OR Apache-2.0"
-rust-version = "1.92"
+rust-version = "1.95"
 version = "0.36.0"
 
 
@@ -92,6 +92,7 @@ rust_2018_idioms = { level = "warn", priority = -1 }
 rust_2021_prelude_collisions = "warn"
 semicolon_in_expressions_from_macros = "warn"
 trivial_numeric_casts = "warn"
+unexpected_cfgs = "warn"
 unsafe_op_in_unsafe_fn = "warn"                         # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
 unused_extern_crates = "warn"
 unused_import_braces = "warn"
@@ -103,6 +104,7 @@ unused_qualifications = "allow"
 
 [workspace.lints.rustdoc]
 all = "warn"
+broken_intra_doc_links = "warn"
 missing_crate_level_docs = "warn"
 
 # See also clippy.toml
@@ -124,6 +126,7 @@ coerce_container_to_any = "warn"
 comparison_chain = "warn"
 dbg_macro = "warn"
 debug_assert_with_mut_call = "warn"
+decimal_bitwise_operands = "warn"
 default_union_representation = "warn"
 derive_partial_eq_without_eq = "warn"
 disallowed_macros = "warn" # See clippy.toml
@@ -136,9 +139,10 @@ doc_comment_double_space_linebreaks = "warn"
 doc_include_without_cfg = "warn"
 doc_link_with_quotes = "warn"
 doc_markdown = "warn"
+duration_suboptimal_units = "warn"
 elidable_lifetime_names = "warn"
-empty_enum = "warn"
 empty_enum_variants_with_brackets = "warn"
+empty_enums = "warn"
 empty_line_after_outer_attr = "warn"
 enum_glob_use = "warn"
 equatable_if_let = "warn"
@@ -154,10 +158,12 @@ flat_map_option = "warn"
 float_cmp_const = "warn"
 fn_params_excessive_bools = "warn"
 fn_to_numeric_cast_any = "warn"
+format_push_string = "warn"
 from_iter_instead_of_collect = "warn"
 get_unwrap = "warn"
 if_let_mutex = "warn"
 ignore_without_reason = "warn"
+ignored_unit_patterns = "warn"
 implicit_clone = "warn"
 implied_bounds_in_impls = "warn"
 imprecise_flops = "warn"
@@ -190,6 +196,7 @@ lossy_float_literal = "warn"
 macro_use_imports = "warn"
 manual_assert = "warn"
 manual_clamp = "warn"
+manual_ilog2 = "warn"
 manual_instant_elapsed = "warn"
 manual_is_power_of_two = "warn"
 manual_is_variant_and = "warn"
@@ -208,6 +215,7 @@ mismatching_type_param_order = "warn"
 missing_assert_message = "warn"
 missing_enforced_import_renames = "warn"
 missing_errors_doc = "warn"
+missing_fields_in_debug = "warn"
 missing_safety_doc = "warn"
 mixed_attributes_style = "warn"
 mut_mut = "warn"
@@ -217,10 +225,13 @@ needless_continue = "warn"
 needless_for_each = "warn"
 needless_pass_by_ref_mut = "warn"
 needless_pass_by_value = "warn"
+needless_raw_string_hashes = "warn"
+needless_type_cast = "warn"
 negative_feature_names = "warn"
 non_std_lazy_statics = "warn"
 non_zero_suggestions = "warn"
 nonstandard_macro_braces = "warn"
+only_used_in_recursion = "warn"
 option_as_ref_cloned = "warn"
 option_option = "warn"
 or_fun_call = "warn"
@@ -237,11 +248,13 @@ rc_mutex = "warn"
 readonly_write_lock = "warn"
 redundant_type_annotations = "warn"
 ref_as_ptr = "warn"
+ref_option = "warn"
 ref_option_ref = "warn"
 ref_patterns = "warn"
 rest_pat_in_fully_bound_structs = "warn"
 return_and_then = "warn"
 same_functions_in_if_condition = "warn"
+same_length_and_capacity = "warn"
 self_only_used_in_recursion = "warn"
 semicolon_if_nothing_returned = "warn"
 set_contains_or_insert = "warn"
@@ -259,6 +272,7 @@ suspicious_command_arg_space = "warn"
 suspicious_xor_used_as_pow = "warn"
 todo = "warn"
 too_long_first_doc_paragraph = "warn"
+too_many_arguments = "warn"
 too_many_lines = "warn"
 trailing_empty_array = "warn"
 trait_duplication_in_bounds = "warn"
@@ -277,6 +291,7 @@ unnecessary_safety_doc = "warn"
 unnecessary_self_imports = "warn"
 unnecessary_semicolon = "warn"
 unnecessary_struct_initialization = "warn"
+unnecessary_trailing_comma = "warn"
 unnecessary_wraps = "warn"
 unnested_or_patterns = "warn"
 unused_async = "warn"

clippy.toml

@@ -5,7 +5,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to scripts/clippy_wasm/clippy.toml:
 
-msrv = "1.92"
+msrv = "1.95"
 
 allow-unwrap-in-tests = true
 

deny.toml

@@ -31,7 +31,11 @@ all-features = true
 [advisories]
 version = 2
 ignore = [
-  "RUSTSEC-2024-0436", # https://rustsec.org/advisories/RUSTSEC-2024-0436 - paste is unmaintained - https://github.com/dtolnay/paste
+  # All of these come in via `eframe`, which is only a dev-dependency of ours,
+  # and only on Linux. We cannot upgrade them without upstream doing so first.
+  "RUSTSEC-2026-0192", # https://rustsec.org/advisories/RUSTSEC-2026-0192 - ttf-parser is unmaintained, via ab_glyph -> sctk-adwaita -> winit. There is no fixed version.
+  "RUSTSEC-2026-0194", # https://rustsec.org/advisories/RUSTSEC-2026-0194 - quick-xml DoS, via zbus_xml -> accesskit_unix. Fixed in 0.41, but zbus_xml requires 0.39.
+  "RUSTSEC-2026-0195", # https://rustsec.org/advisories/RUSTSEC-2026-0195 - quick-xml DoS, via zbus_xml -> accesskit_unix. Fixed in 0.41, but zbus_xml requires 0.39.
 ]
 
 

egui_plot/src/aesthetics.rs

@@ -67,7 +67,7 @@ impl LineStyle {
                         if highlight {
                             stroke.width *= 2.0;
                         }
-                        let golden_ratio = (5.0_f32.sqrt() - 1.0) / 2.0; // 0.61803398875
+                        let golden_ratio = std::f32::consts::GOLDEN_RATIO - 1.0; // 0.61803398875
                         shapes.extend(Shape::dashed_line(
                             &line,
                             Stroke::new(stroke.width, path_stroke_color),

egui_plot/src/items/bar_chart.rs

@@ -23,7 +23,7 @@ use crate::items::PlotGeometry;
 use crate::items::PlotItem;
 use crate::items::PlotItemBase;
 use crate::items::add_rulers_and_text;
-use crate::label::LabelFormatter;
+use crate::label::LabelFormatterFn;
 use crate::math::find_closest_rect;
 use crate::rect_elem::RectElement;
 
@@ -210,7 +210,7 @@ impl PlotItem for BarChart {
         shapes: &mut Vec<Shape>,
         cursors: &mut Vec<Cursor>,
         plot: &PlotConfig<'_>,
-        _: &Option<LabelFormatter<'_>>,
+        _: Option<&LabelFormatterFn<'_>>,
     ) {
         let bar = &self.bars[elem.index];
 

egui_plot/src/items/box_plot.rs

@@ -22,7 +22,7 @@ use crate::items::PlotGeometry;
 use crate::items::PlotItem;
 use crate::items::PlotItemBase;
 use crate::items::add_rulers_and_text;
-use crate::label::LabelFormatter;
+use crate::label::LabelFormatterFn;
 use crate::math::find_closest_rect;
 use crate::rect_elem::RectElement;
 
@@ -176,7 +176,7 @@ impl PlotItem for BoxPlot {
         shapes: &mut Vec<Shape>,
         cursors: &mut Vec<Cursor>,
         plot: &PlotConfig<'_>,
-        _: &Option<LabelFormatter<'_>>,
+        _: Option<&LabelFormatterFn<'_>>,
     ) {
         let box_plot = &self.boxes[elem.index];
 

egui_plot/src/items/heatmap.rs

@@ -24,7 +24,7 @@ use crate::items::PlotConfig;
 use crate::items::PlotGeometry;
 use crate::items::PlotItem;
 use crate::items::PlotItemBase;
-use crate::label::LabelFormatter;
+use crate::label::LabelFormatterFn;
 
 /// Default resolution for heatmap color palette
 pub const DEFAULT_RESOLUTION: usize = 128;
@@ -459,7 +459,7 @@ impl PlotItem for Heatmap {
         shapes: &mut Vec<Shape>,
         _cursors: &mut Vec<Cursor>,
         plot: &PlotConfig<'_>,
-        _: &Option<LabelFormatter<'_>>,
+        _: Option<&LabelFormatterFn<'_>>,
     ) {
         let (rect, color, text) = self.tile_view_info(plot.ui, plot.transform, elem.index);
         let mut mesh = Mesh::default();

egui_plot/src/items/mod.rs

@@ -41,7 +41,7 @@ pub use crate::items::series::Line;
 pub use crate::items::span::Span;
 pub use crate::items::text::Text;
 use crate::label::HoverPosition;
-use crate::label::LabelFormatter;
+use crate::label::LabelFormatterFn;
 use crate::rect_elem::RectElement;
 
 mod arrows;
@@ -175,7 +175,7 @@ pub trait PlotItem {
         shapes: &mut Vec<Shape>,
         cursors: &mut Vec<Cursor>,
         plot: &PlotConfig<'_>,
-        label_formatter: &Option<LabelFormatter<'_>>,
+        label_formatter: Option<&LabelFormatterFn<'_>>,
     ) {
         let points = match self.geometry() {
             PlotGeometry::Points(points) => points,
@@ -283,7 +283,7 @@ pub(super) fn rulers_and_tooltip_at_value(
     nearest_point: Option<(&str, usize)>,
     plot: &PlotConfig<'_>,
     cursors: &mut Vec<Cursor>,
-    label_formatter: &Option<LabelFormatter<'_>>,
+    label_formatter: Option<&LabelFormatterFn<'_>>,
 ) {
     // Add crosshair rulers if enabled
     if plot.show_crosshair {