Some Cleanup for Rust 1.89 (#885)

- Replaced nested if / if let with let chains.
- With the new lifetime warning rules, it became possible to remove some
  unnecessary explicit `'_` lifetimes.
- Resolved some clippy lints (mostly missing const fns).
- Switched `#[allow]` to `#[expect]` for most lints. This should catch
  situations where the warning no longer applies. It already caught a
  few of those.
- Updated test snapshot hashes that seem to have changed again (the
  fonts on Windows got updated).

Author: CryZe

Cargo.toml

@@ -23,7 +23,7 @@ include = [
     "/README.md",
 ]
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.89"
 
 [package.metadata.docs.rs]
 all-features = true

capi/bind_gen/src/swift/code.rs

@@ -7,7 +7,7 @@ use std::{
     io::{Result, Write},
 };
 
-fn get_hl_type(ty: &Type) -> Cow<str> {
+fn get_hl_type(ty: &Type) -> Cow<'_, str> {
     if ty.is_custom {
         match ty.kind {
             TypeKind::Ref => Cow::Owned(format!("{}Ref", ty.name)),
@@ -46,7 +46,7 @@ fn get_ll_type(ty: &Type) -> &str {
     }
 }
 
-fn get_input_name(name: &str) -> Cow<str> {
+fn get_input_name(name: &str) -> Cow<'_, str> {
     if name == "this" {
         Cow::Borrowed("self")
     } else {

capi/src/auto_splitting_runtime.rs

@@ -12,10 +12,10 @@ type AutoSplittingRuntime = livesplit_core::auto_splitting::Runtime<livesplit_co
 use livesplit_core::SharedTimer;
 
 #[cfg(not(feature = "auto-splitting"))]
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 pub struct AutoSplittingRuntime;
 
-#[allow(warnings)]
+#[expect(warnings)]
 #[cfg(not(feature = "auto-splitting"))]
 impl AutoSplittingRuntime {
     pub fn new() -> Self {

capi/src/command_sink.rs

@@ -11,8 +11,8 @@
 use std::{borrow::Cow, future::Future, ops::Deref, pin::Pin, sync::Arc};
 
 use livesplit_core::{
-    event::{self, Result},
     TimeSpan, Timer, TimingMethod,
+    event::{self, Result},
 };
 
 use crate::shared_timer::OwnedSharedTimer;
@@ -50,15 +50,15 @@ pub(crate) trait CommandSinkAndQuery: Send + Sync + 'static {
     fn dyn_undo_all_pauses(&self) -> Fut;
     fn dyn_switch_to_previous_comparison(&self) -> Fut;
     fn dyn_switch_to_next_comparison(&self) -> Fut;
-    fn dyn_set_current_comparison(&self, comparison: Cow<'_, str>) -> Fut;
+    fn dyn_set_current_comparison(&self, comparison: Cow<str>) -> Fut;
     fn dyn_toggle_timing_method(&self) -> Fut;
     fn dyn_set_current_timing_method(&self, method: TimingMethod) -> Fut;
     fn dyn_initialize_game_time(&self) -> Fut;
     fn dyn_set_game_time(&self, time: TimeSpan) -> Fut;
     fn dyn_pause_game_time(&self) -> Fut;
     fn dyn_resume_game_time(&self) -> Fut;
     fn dyn_set_loading_times(&self, time: TimeSpan) -> Fut;
-    fn dyn_set_custom_variable(&self, name: Cow<'_, str>, value: Cow<'_, str>) -> Fut;
+    fn dyn_set_custom_variable(&self, name: Cow<str>, value: Cow<str>) -> Fut;
 }
 
 type Fut = Pin<Box<dyn Future<Output = Result> + 'static>>;
@@ -107,7 +107,7 @@ where
     fn dyn_switch_to_next_comparison(&self) -> Fut {
         Box::pin(self.switch_to_next_comparison())
     }
-    fn dyn_set_current_comparison(&self, comparison: Cow<'_, str>) -> Fut {
+    fn dyn_set_current_comparison(&self, comparison: Cow<str>) -> Fut {
         Box::pin(self.set_current_comparison(comparison))
     }
     fn dyn_toggle_timing_method(&self) -> Fut {
@@ -131,7 +131,7 @@ where
     fn dyn_set_loading_times(&self, time: TimeSpan) -> Fut {
         Box::pin(self.set_loading_times(time))
     }
-    fn dyn_set_custom_variable(&self, name: Cow<'_, str>, value: Cow<'_, str>) -> Fut {
+    fn dyn_set_custom_variable(&self, name: Cow<str>, value: Cow<str>) -> Fut {
         Box::pin(self.set_custom_variable(name, value))
     }
 }
@@ -187,7 +187,7 @@ impl event::CommandSink for CommandSink {
 
     fn set_current_comparison(
         &self,
-        comparison: Cow<'_, str>,
+        comparison: Cow<str>,
     ) -> impl Future<Output = Result> + 'static {
         self.0.dyn_set_current_comparison(comparison)
     }
@@ -225,8 +225,8 @@ impl event::CommandSink for CommandSink {
 
     fn set_custom_variable(
         &self,
-        name: Cow<'_, str>,
-        value: Cow<'_, str>,
+        name: Cow<str>,
+        value: Cow<str>,
     ) -> impl Future<Output = Result> + 'static {
         self.0.dyn_set_custom_variable(name, value)
     }

capi/src/lib.rs

@@ -4,8 +4,7 @@
     clippy::perf,
     clippy::style,
     clippy::needless_pass_by_ref_mut,
-    missing_docs,
-    rust_2018_idioms
+    missing_docs
 )]
 #![allow(clippy::missing_safety_doc, non_camel_case_types, non_snake_case)]
 
@@ -101,7 +100,7 @@ use livesplit_core::{Time, TimeSpan};
 /// type
 pub type Json = *const c_char;
 /// type
-#[allow(non_camel_case_types)]
+#[expect(non_camel_case_types)]
 pub type Nullablec_char = c_char;
 
 thread_local! {

capi/src/software_renderer.rs

@@ -17,7 +17,7 @@ impl SoftwareRenderer {
         panic!("The software renderer is not compiled in.")
     }
 
-    #[allow(warnings)]
+    #[expect(warnings)]
     fn render(
         &mut self,
         _: &LayoutState,

capi/src/web_command_sink.rs

@@ -222,7 +222,7 @@ impl CommandSink for WebCommandSink {
 
     fn set_current_comparison(
         &self,
-        comparison: Cow<'_, str>,
+        comparison: Cow<str>,
     ) -> impl Future<Output = Result> + 'static {
         debug_assert!(!self.locked.get());
         handle_action_value(
@@ -303,8 +303,8 @@ impl CommandSink for WebCommandSink {
 
     fn set_custom_variable(
         &self,
-        name: Cow<'_, str>,
-        value: Cow<'_, str>,
+        name: Cow<str>,
+        value: Cow<str>,
     ) -> impl Future<Output = Result> + 'static {
         debug_assert!(!self.locked.get());
         handle_action_value(self.set_custom_variable.as_ref().and_then(|f| {

capi/src/web_rendering.rs

@@ -20,7 +20,7 @@ impl WebRenderer {
     /// default fonts. They are called "timer" and "fira". Make sure they are
     /// fully loaded before creating the renderer as otherwise information about
     /// a fallback font is cached instead.
-    #[allow(clippy::new_without_default)]
+    #[expect(clippy::new_without_default)]
     #[wasm_bindgen(constructor)]
     pub fn new() -> Self {
         Self {

crates/livesplit-auto-splitting/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 description = "livesplit-auto-splitting is a library that provides a runtime for running auto splitters that can control a speedrun timer. These auto splitters are provided as WebAssembly modules."
 keywords = ["speedrun", "timer", "livesplit", "auto-splitting"]
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.89"
 
 [dependencies]
 anyhow = { version = "1.0.45", default-features = false }

crates/livesplit-auto-splitting/src/lib.rs

@@ -570,8 +570,7 @@
     clippy::style,
     clippy::missing_const_for_fn,
     clippy::undocumented_unsafe_blocks,
-    missing_docs,
-    rust_2018_idioms
+    missing_docs
 )]
 #![forbid(clippy::incompatible_msrv)]
 
@@ -595,6 +594,7 @@ const _: () = {
     assert_send_sync::<Process>();
     assert_send_sync::<Runtime>();
     assert_send_sync::<CompiledAutoSplitter>();
+    #[expect(dead_code)] // Not actually dead, as we use it for the assertion inside.
     const fn with_timer<T: Send + Sync + Timer>() {
         assert_send_sync::<AutoSplitter<T>>();
     }