Update stable Rust to 1.92 and satisfy Clippy. (#2421)

Time to get CI passing again.

Author: xStrom

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ env:
   # version like 1.70. Note that we only specify MAJOR.MINOR and not PATCH so that bugfixes still
   # come automatically. If the version specified here is no longer the latest stable version,
   # then please feel free to submit a PR that adjusts it along with the potential clippy fixes.
-  RUST_STABLE_VER: "1.82" # In quotes because otherwise 1.70 would be interpreted as 1.7
+  RUST_STABLE_VER: "1.92" # In quotes because otherwise 1.70 would be interpreted as 1.7
 
 name: CI
 

druid-derive/src/lib.rs

@@ -23,8 +23,8 @@ use syn::parse_macro_input;
 ///
 /// - `#[data(ignore)]` makes the generated `Data::same` function skip comparing this field.
 /// - `#[data(same_fn="foo")]` uses the function `foo` for comparing this field. `foo` should
-///    be the name of a function with signature `fn(&T, &T) -> bool`, where `T` is the type of
-///    the field.
+///   be the name of a function with signature `fn(&T, &T) -> bool`, where `T` is the type of
+///   the field.
 /// - `#[data(eq)]` is shorthand for `#[data(same_fn = "PartialEq::eq")]`
 ///
 /// # Example
@@ -61,7 +61,7 @@ pub fn derive_data(input: TokenStream) -> TokenStream {
 ///
 /// - `#[lens(ignore)]` skips creating a lens for one field.
 /// - `#[lens(name="foo")]` gives the lens the specified name (instead of the default, which is to
-///    create a lens with the same name as the field).
+///   create a lens with the same name as the field).
 ///
 /// # Example
 ///

druid-shell/Cargo.toml

@@ -60,6 +60,11 @@ tga = ["piet-common/tga"]
 hdr = ["piet-common/hdr"]
 serde = ["piet-common/serde"]
 
+[lints]
+# The 'objc' package is broken and abandoned, needs this hack.
+# https://github.com/SSheldon/rust-objc/issues/125
+rust.unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("cargo-clippy"))'] }
+
 [dependencies]
 piet-common = { version = "=0.7.0-cairo18" }
 

druid-shell/examples/edit_text.rs

@@ -209,7 +209,7 @@ impl InputHandler for AppInputHandler {
         doc.composition = None;
         self.window_handle.request_anim_frame();
     }
-    fn slice(&self, range: Range<usize>) -> Cow<str> {
+    fn slice(&self, range: Range<usize>) -> Cow<'_, str> {
         self.state.borrow().text[range].to_string().into()
     }
     fn is_char_boundary(&self, i: usize) -> bool {

druid-shell/src/application.rs

@@ -173,3 +173,8 @@ impl Application {
         backend::Application::get_locale()
     }
 }
+
+/// Perform any initialization needed for the testing harness.
+pub fn init_harness() {
+    backend::init_harness();
+}

druid-shell/src/backend/gtk/application.rs

@@ -87,3 +87,5 @@ impl crate::platform::linux::ApplicationExt for crate::Application {
         })
     }
 }
+
+pub fn init_harness() {}

druid-shell/src/backend/mac/application.rs

@@ -8,6 +8,7 @@
 use std::cell::RefCell;
 use std::ffi::c_void;
 use std::rc::Rc;
+use std::sync::Once;
 
 use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular};
 use cocoa::base::{id, nil, NO, YES};
@@ -183,3 +184,10 @@ extern "C" fn handle_menu_item(this: &mut Object, _: Sel, item: id) {
         (*inner).command(tag as u32);
     }
 }
+
+pub fn init_harness() {
+    static INIT: Once = Once::new();
+    INIT.call_once(|| unsafe {
+        let _app: id = msg_send![class!(NSApplication), sharedApplication];
+    });
+}

druid-shell/src/backend/wayland/application.rs

@@ -372,7 +372,7 @@ impl Application {
                 return;
             }
 
-            if appdata.handles.borrow().len() == 0 {
+            if appdata.handles.borrow().is_empty() {
                 tracing::debug!("shutting down, no window remaining");
                 signal.stop();
                 return;
@@ -566,3 +566,5 @@ impl Seat {
         }
     }
 }
+
+pub fn init_harness() {}

druid-shell/src/backend/wayland/display.rs

@@ -49,6 +49,7 @@ where
 
 pub trait GlobalEventDispatch {
     fn subscribe(&self, sub: impl Into<GlobalEventSubscription>) -> GlobalEventSubscription;
+    #[expect(dead_code)] // Until it's not dead
     fn release(&self, s: &GlobalEventSubscription);
 }
 

druid-shell/src/backend/wayland/surfaces/popup.rs

@@ -122,10 +122,7 @@ impl Surface {
             tracing::debug!("{:?} {:?}", obj, event);
         });
 
-        let wl_xdg_popup = match parent.surface(&wl_xdg_surface, &wl_xdg_pos) {
-            Ok(p) => p,
-            Err(cause) => return Err(cause),
-        };
+        let wl_xdg_popup = parent.surface(&wl_xdg_surface, &wl_xdg_pos)?;
         wl_xdg_popup.quick_assign({
             let wl_surface = wl_surface.clone();
             move |_xdg_popup, event, _| {