Update MSRV from 1.88 to 1.92 (#7793)

2026-06-26 14:49:06 -04:00 · 2025-12-20 22:52:34 +10:00
parent 8d98763fe1
commit 661d5f9173
42 changed files with 53 additions and 53 deletions
--- a/.github/workflows/cargo_machete.yml
+++ b/.github/workflows/cargo_machete.yml
@@ -9,7 +9,7 @@ jobs:
    steps:
      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88
+          toolchain: 1.92
      - name: Machete install
        ## The official cargo-machete action
        uses: bnjbvr/cargo-machete@v0.9.1
--- a/.github/workflows/deploy_web_demo.yml
+++ b/.github/workflows/deploy_web_demo.yml
@@ -38,7 +38,7 @@ jobs:
        with:
          profile: minimal
          target: wasm32-unknown-unknown
-          toolchain: 1.88.0
+          toolchain: 1.92.0
          override: true

      - uses: Swatinem/rust-cache@v2
--- a/.github/workflows/preview_build.yml
+++ b/.github/workflows/preview_build.yml
@@ -20,7 +20,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
          targets: wasm32-unknown-unknown
      - uses: Swatinem/rust-cache@v2
        with:
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:

      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0

      - name: Install packages (Linux)
        if: runner.os == 'Linux'
@@ -74,7 +74,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
          targets: wasm32-unknown-unknown

      - run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev
@@ -148,7 +148,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: EmbarkStudios/cargo-deny-action@v2
        with:
-          rust-version: "1.88.0"
+          rust-version: "1.92.0"
          log-level: error
          command: check
          arguments: --target  ${{ matrix.target }}
@@ -164,7 +164,7 @@ jobs:

      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
          targets: aarch64-linux-android

      - name: Set up cargo cache
@@ -186,7 +186,7 @@ jobs:

      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
          targets: aarch64-apple-ios

      - name: Set up cargo cache
@@ -206,7 +206,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0

      - name: Set up cargo cache
        uses: Swatinem/rust-cache@v2
@@ -228,7 +228,7 @@ jobs:
          lfs: true
      - uses: dtolnay/rust-toolchain@stable
        with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0

      - name: Set up cargo cache
        uses: Swatinem/rust-cache@v2
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 [workspace.package]
 edition = "2024"
 license = "MIT OR Apache-2.0"
-rust-version = "1.88"
+rust-version = "1.92"
 version = "0.33.3"


@@ -311,7 +311,6 @@ string_add = "warn"
 string_add_assign = "warn"
 string_lit_as_bytes = "warn"
 string_lit_chars_any = "warn"
-string_to_string = "warn"
 suspicious_command_arg_space = "warn"
 suspicious_xor_used_as_pow = "warn"
 todo = "warn"
@@ -320,7 +319,7 @@ trailing_empty_array = "warn"
 trait_duplication_in_bounds = "warn"
 transmute_ptr_to_ptr = "warn"
 tuple_array_conversions = "warn"
-unchecked_duration_subtraction = "warn"
+unchecked_time_subtraction = "warn"
 undocumented_unsafe_blocks = "warn"
 unimplemented = "warn"
 uninhabited_references = "warn"
--- a/clippy.toml
+++ b/clippy.toml
@@ -3,7 +3,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to scripts/clippy_wasm/clippy.toml:

-msrv = "1.88"
+msrv = "1.92"

 allow-unwrap-in-tests = true

@@ -39,9 +39,9 @@ disallowed-methods = [
  # but we cannot disable them all here (because of e.g. https://github.com/rust-lang/rust-clippy/issues/10406)
  # so we do that in `clipppy_wasm.toml` instead.

-  { path = "std::env::temp_dir", readon = "Use the tempfile crate instead" },
+  { path = "std::env::temp_dir", reason = "Use the tempfile crate instead" },
  { path = "std::panic::catch_unwind", reason = "We compile with `panic = abort" },
-  { path = "std::thread::spawn", readon = "Use `std::thread::Builder` and name the thread" },
+  { path = "std::thread::spawn", reason = "Use `std::thread::Builder` and name the thread" },
 ]

 # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names
--- a/crates/eframe/src/web/mod.rs
+++ b/crates/eframe/src/web/mod.rs
@@ -285,8 +285,8 @@ fn create_clipboard_item(mime: &str, bytes: &[u8]) -> Result<web_sys::ClipboardI

    let items = js_sys::Object::new();

-    // SAFETY: I hope so
    #[expect(unsafe_code, unused_unsafe)] // Weird false positive
+    // SAFETY: I hope so
    unsafe {
        js_sys::Reflect::set(&items, &JsValue::from_str(mime), &blob)?
    };
--- a/crates/egui/src/containers/area.rs
+++ b/crates/egui/src/containers/area.rs
@@ -172,7 +172,7 @@ impl Area {

    /// Set the [`UiStackInfo`] of the area's [`Ui`].
    ///
-    /// Default to [`UiStackInfo::new(UiKind::GenericArea)`].
+    /// Default to [`UiStackInfo`] with kind [`UiKind::GenericArea`].
    #[inline]
    pub fn info(mut self, info: UiStackInfo) -> Self {
        self.info = info;
--- a/crates/egui/src/containers/frame.rs
+++ b/crates/egui/src/containers/frame.rs
@@ -336,7 +336,7 @@ impl Frame {
 impl Frame {
    /// How much extra space the frame uses up compared to the content.
    ///
-    /// [`Self::inner_margin`] + [`Self.stroke`]`.width` + [`Self::outer_margin`].
+    /// [`Self::inner_margin`] + [`Self::stroke`]`.width` + [`Self::outer_margin`].
    #[inline]
    pub fn total_margin(&self) -> MarginF32 {
        MarginF32::from(self.inner_margin)
--- a/crates/egui/src/lib.rs
+++ b/crates/egui/src/lib.rs
@@ -3,7 +3,7 @@
 //! Try the live web demo: <https://www.egui.rs/#demo>. Read more about egui at <https://github.com/emilk/egui>.
 //!
 //! `egui` is in heavy development, with each new version having breaking changes.
-//! You need to have rust 1.88.0 or later to use `egui`.
+//! You need to have rust 1.92.0 or later to use `egui`.
 //!
 //! To quickly get started with egui, you can take a look at [`eframe_template`](https://github.com/emilk/eframe_template)
 //! which uses [`eframe`](https://docs.rs/eframe).
--- a/crates/egui/src/response.rs
+++ b/crates/egui/src/response.rs
@@ -14,7 +14,7 @@ use crate::{
 /// It also lets you easily show a tooltip on hover.
 ///
 /// Whenever something gets added to a [`Ui`], a [`Response`] object is returned.
-/// [`ui.add`] returns a [`Response`], as does [`ui.button`], and all similar shortcuts.
+/// [`Ui::add`] returns a [`Response`], as does [`Ui::button`], and all similar shortcuts.
 ///
 /// ⚠️ The `Response` contains a clone of [`Context`], and many methods lock the `Context`.
 /// It can therefore be a deadlock to use `Context` from within a context-locking closures,
--- a/crates/egui_demo_lib/benches/benchmark.rs
+++ b/crates/egui_demo_lib/benches/benchmark.rs
@@ -198,6 +198,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
            let mut string = String::new();
            for _ in 0..NUM_LINES {
                for i in 0..30_u8 {
+                    #[expect(clippy::unwrap_used)]
                    write!(string, "{i:02X} ").unwrap();
                }
                string.push('\n');
--- a/crates/egui_kittest/tests/regression_tests.rs
+++ b/crates/egui_kittest/tests/regression_tests.rs
@@ -194,7 +194,7 @@ pub fn menus_should_close_even_if_submenu_disappears() {
    const OTHER_BUTTON: &str = "Other button";
    const MENU_BUTTON: &str = "Menu";
    const SUB_MENU_BUTTON: &str = "Always here";
-    const TOGGLABLE_SUB_MENU_BUTTON: &str = "Maybe here";
+    const TOGGLEABLE_SUB_MENU_BUTTON: &str = "Maybe here";
    const INSIDE_SUB_MENU_BUTTON: &str = "Inside submenu";

    for frame_delay in (0..3).rev() {
@@ -206,7 +206,7 @@ pub fn menus_should_close_even_if_submenu_disappears() {
                Popup::menu(&response).show(|ui| {
                    let _ = ui.button(SUB_MENU_BUTTON);
                    if *state {
-                        ui.menu_button(TOGGLABLE_SUB_MENU_BUTTON, |ui| {
+                        ui.menu_button(TOGGLEABLE_SUB_MENU_BUTTON, |ui| {
                            let _ = ui.button(INSIDE_SUB_MENU_BUTTON);
                        });
                    }
@@ -221,7 +221,7 @@ pub fn menus_should_close_even_if_submenu_disappears() {

        // Open the sub menu
        harness
-            .get_by_label_contains(TOGGLABLE_SUB_MENU_BUTTON)
+            .get_by_label_contains(TOGGLEABLE_SUB_MENU_BUTTON)
            .hover();
        harness.run();

--- a/examples/confirm_exit/Cargo.toml
+++ b/examples/confirm_exit/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/custom_3d_glow/Cargo.toml
+++ b/examples/custom_3d_glow/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/custom_font/Cargo.toml
+++ b/examples/custom_font/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/custom_font_style/Cargo.toml
+++ b/examples/custom_font_style/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["tami5 <kkharji@proton.me>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/custom_keypad/Cargo.toml
+++ b/examples/custom_keypad/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Varphone Wong <varphone@qq.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/custom_style/Cargo.toml
+++ b/examples/custom_style/Cargo.toml
@@ -3,7 +3,7 @@ name = "custom_style"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/custom_window_frame/Cargo.toml
+++ b/examples/custom_window_frame/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/external_eventloop/Cargo.toml
+++ b/examples/external_eventloop/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Will Brown <opensource@rebeagle.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/external_eventloop_async/Cargo.toml
+++ b/examples/external_eventloop_async/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Will Brown <opensource@rebeagle.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/file_dialog/Cargo.toml
+++ b/examples/file_dialog/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/hello_android/Cargo.toml
+++ b/examples/hello_android/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 # `unsafe_code` is required for `#[no_mangle]`, disable workspace lints to workaround lint error.
--- a/examples/hello_world/Cargo.toml
+++ b/examples/hello_world/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/hello_world_par/Cargo.toml
+++ b/examples/hello_world_par/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Maxim Osipenko <maxim1999max@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/hello_world_simple/Cargo.toml
+++ b/examples/hello_world_simple/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/images/Cargo.toml
+++ b/examples/images/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Jan Procházka <github.com/jprochazk>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/keyboard_events/Cargo.toml
+++ b/examples/keyboard_events/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Jose Palazon <jose@palako.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/multiple_viewports/Cargo.toml
+++ b/examples/multiple_viewports/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/puffin_profiler/Cargo.toml
+++ b/examples/puffin_profiler/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [package.metadata.cargo-machete]
--- a/examples/screenshot/Cargo.toml
+++ b/examples/screenshot/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["René Rössler <rene@freshx.de>", "Andreas Faber <andreas.mfaber@gmail.com"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/serial_windows/Cargo.toml
+++ b/examples/serial_windows/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/examples/user_attention/Cargo.toml
+++ b/examples/user_attention/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["TicClick <ya@ticclick.ch>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/2
+++ b/2
@@ -5,6 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".

 [toolchain]
-channel = "1.88.0"
+channel = "1.92.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -9,7 +9,7 @@ set -x
 # Checks all tests, lints etc.
 # Basically does what the CI does.

-# cargo +1.88.0 install --quiet typos-cli
+# cargo +1.92.0 install --quiet typos-cli

 export RUSTFLAGS="-D warnings"
 export RUSTDOCFLAGS="-D warnings" # https://github.com/emilk/egui/pull/1454
--- a/scripts/clippy_wasm/clippy.toml
+++ b/scripts/clippy_wasm/clippy.toml
@@ -6,7 +6,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to the root clippy.toml:

-msrv = "1.88"
+msrv = "1.92"

 allow-unwrap-in-tests = true

--- a/tests/test_egui_extras_compilation/Cargo.toml
+++ b/tests/test_egui_extras_compilation/Cargo.toml
@@ -3,7 +3,7 @@ name = "test_egui_extras_compilation"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/tests/test_inline_glow_paint/Cargo.toml
+++ b/tests/test_inline_glow_paint/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/tests/test_size_pass/Cargo.toml
+++ b/tests/test_size_pass/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/tests/test_ui_stack/Cargo.toml
+++ b/tests/test_ui_stack/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Antoine Beyeler <abeyeler@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]
--- a/tests/test_viewports/Cargo.toml
+++ b/tests/test_viewports/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["konkitoman"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false

 [lints]