Update to Rust 1.76 (#4411)

Motivation: I want to replace `cargo-cranky` with workspace lints, first available in Rust 1.74. However, `cargo doc` would hange on `wgpu` and `wgpu-core` on 1.74 and 1.75… so now we're on 1.76. I think this is fine - when 1.78 is released next week we're still two versions behind the bleeding edge. …and the branch name is just wrong 🤦
emilk · Apr 25, 2024 · cee7906 · cee7906
1 parent bfe1858
commit cee7906
Show file tree

Hide file tree

Showing 37 changed files with 45 additions and 48 deletions.
diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           profile: minimal
           target: wasm32-unknown-unknown
-          toolchain: 1.72.0
+          toolchain: 1.76.0
           override: true
 
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.72.0
+          toolchain: 1.76.0
 
       - name: Install packages (Linux)
         if: runner.os == 'Linux'
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.72.0
+          toolchain: 1.76.0
           targets: wasm32-unknown-unknown
 
       - run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev
@@ -151,7 +151,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
-          rust-version: "1.72.0"
+          rust-version: "1.76.0"
           log-level: error
           command: check
           arguments: --target  ${{ matrix.target }}
@@ -166,7 +166,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.72.0
+          toolchain: 1.76.0
           targets: aarch64-linux-android
 
       - name: Set up cargo cache
@@ -184,7 +184,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.72.0
+          toolchain: 1.76.0
 
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2

diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ members = [
 [workspace.package]
 edition = "2021"
 license = "MIT OR Apache-2.0"
-rust-version = "1.72"
+rust-version = "1.76"
 version = "0.27.2"
 
 

diff --git a/clippy.toml b/clippy.toml
@@ -3,7 +3,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to scripts/clippy_wasm/clippy.toml:
 
-msrv = "1.72"
+msrv = "1.76"
 
 allow-unwrap-in-tests = true
 

diff --git a/crates/eframe/src/native/app_icon.rs b/crates/eframe/src/native/app_icon.rs
@@ -225,9 +225,7 @@ fn set_title_and_icon_mac(title: &str, icon_data: Option<&IconData>) -> AppIconS
     }
 
     unsafe {
-        let app = if let Some(app) = NSApp {
-            app
-        } else {
+        let Some(app) = NSApp else {
             log::debug!("NSApp is null");
             return AppIconStatus::NotSetIgnored;
         };

diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
@@ -391,6 +391,8 @@ pub fn run_glow(
     mut native_options: epi::NativeOptions,
     app_creator: epi::AppCreator,
 ) -> Result<()> {
+    #![allow(clippy::needless_return_with_question_mark)] // False positive
+
     use super::glow_integration::GlowWinitApp;
 
     #[cfg(not(target_os = "ios"))]
@@ -414,6 +416,8 @@ pub fn run_wgpu(
     mut native_options: epi::NativeOptions,
     app_creator: epi::AppCreator,
 ) -> Result<()> {
+    #![allow(clippy::needless_return_with_question_mark)] // False positive
+
     use super::wgpu_integration::WgpuWinitApp;
 
     #[cfg(not(target_os = "ios"))]

diff --git a/crates/eframe/src/web/storage.rs b/crates/eframe/src/web/storage.rs
@@ -31,7 +31,7 @@ pub(crate) fn load_memory(_: &egui::Context) {}
 
 #[cfg(feature = "persistence")]
 pub(crate) fn save_memory(ctx: &egui::Context) {
-    match ctx.memory(|mem| ron::to_string(mem)) {
+    match ctx.memory(ron::to_string) {
         Ok(ron) => {
             local_storage_set("egui_memory_ron", &ron);
         }

diff --git a/crates/egui/src/containers/collapsing_header.rs b/crates/egui/src/containers/collapsing_header.rs
@@ -230,7 +230,7 @@ impl CollapsingState {
         }
     }
 
-    /// Paint this [CollapsingState](CollapsingState)'s toggle button. Takes an [IconPainter](IconPainter) as the icon.
+    /// Paint this [`CollapsingState`]'s toggle button. Takes an [`IconPainter`] as the icon.
     /// ```
     /// # egui::__run_test_ui(|ui| {
     /// fn circle_icon(ui: &mut egui::Ui, openness: f32, response: &egui::Response) {

diff --git a/crates/egui/src/lib.rs b/crates/egui/src/lib.rs
@@ -517,7 +517,7 @@ macro_rules! include_image {
     };
 }
 
-/// Create a [`Hyperlink`](crate::Hyperlink) to the current [`file!()`] (and line) on Github
+/// Create a [`Hyperlink`] to the current [`file!()`] (and line) on Github
 ///
 /// ```
 /// # egui::__run_test_ui(|ui| {
@@ -532,7 +532,7 @@ macro_rules! github_link_file_line {
     }};
 }
 
-/// Create a [`Hyperlink`](crate::Hyperlink) to the current [`file!()`] on github.
+/// Create a [`Hyperlink`] to the current [`file!()`] on github.
 ///
 /// ```
 /// # egui::__run_test_ui(|ui| {

diff --git a/crates/egui/src/memory.rs b/crates/egui/src/memory.rs
@@ -868,7 +868,7 @@ impl Memory {
 // ----------------------------------------------------------------------------
 
 /// Keeps track of [`Area`](crate::containers::area::Area)s, which are free-floating [`Ui`](crate::Ui)s.
-/// These [`Area`](crate::containers::area::Area)s can be in any [`Order`](crate::Order).
+/// These [`Area`](crate::containers::area::Area)s can be in any [`Order`].
 #[derive(Clone, Debug, Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]

diff --git a/crates/egui/src/style.rs b/crates/egui/src/style.rs
@@ -288,7 +288,7 @@ pub struct Spacing {
     /// Default rail height of a [`Slider`].
     pub slider_rail_height: f32,
 
-    /// Default (minimum) width of a [`ComboBox`](crate::ComboBox).
+    /// Default (minimum) width of a [`ComboBox`].
     pub combo_width: f32,
 
     /// Default width of a [`TextEdit`].

diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs
@@ -131,7 +131,7 @@ impl Column {
         self
     }
 
-    /// Allowed range of movement (in points), if in a resizable [`Table`](crate::table::Table).
+    /// Allowed range of movement (in points), if in a resizable [`Table`].
     #[inline]
     pub fn range(mut self, range: impl Into<Rangef>) -> Self {
         self.width_range = range.into();

diff --git a/crates/epaint/src/shape.rs b/crates/epaint/src/shape.rs
@@ -1293,12 +1293,7 @@ impl std::fmt::Debug for PaintCallback {
 
 impl std::cmp::PartialEq for PaintCallback {
     fn eq(&self, other: &Self) -> bool {
-        // As I understand it, the problem this clippy is trying to protect against
-        // can only happen if we do dynamic casts back and forth on the pointers, and we don't do that.
-        #[allow(clippy::vtable_address_comparisons)]
-        {
-            self.rect.eq(&other.rect) && Arc::ptr_eq(&self.callback, &other.callback)
-        }
+        self.rect.eq(&other.rect) && Arc::ptr_eq(&self.callback, &other.callback)
     }
 }
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git a/examples/custom_plot_manipulation/Cargo.toml b/examples/custom_plot_manipulation/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Ygor Souza <ygor.souza@protonmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git a/examples/images/src/ferris.svg b/examples/images/src/ferris.svg
diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 [features]

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git a/examples/save_plot/Cargo.toml b/examples/save_plot/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["hacknus <l_stoeckli@bluewin.ch>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 [dependencies]

diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml
@@ -7,7 +7,7 @@ authors = [
 ]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 

diff --git a/examples/test_inline_glow_paint/Cargo.toml b/examples/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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/examples/test_viewports/Cargo.toml b/examples/test_viewports/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["konkitoman"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 [features]

diff --git 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 = "2021"
-rust-version = "1.72"
+rust-version = "1.76"
 publish = false
 
 [dependencies]

diff --git a/rust-toolchain b/rust-toolchain
@@ -5,6 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.72.0"
+channel = "1.76.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]
diff --git 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.72"
+msrv = "1.76"
 
 allow-unwrap-in-tests = true