From d848fb7f25542b90b1ed2d1c1609868e1902d444 Mon Sep 17 00:00:00 2001
From: Christopher Serr <christopher.serr@gmail.com>
Date: Mon, 4 Nov 2024 17:32:30 +0100
Subject: [PATCH] Update to wasmtime 26 (#850)

This updates our wasmtime dependency to version 26.
---
 Cargo.toml                                 | 4 ++--
 crates/livesplit-auto-splitting/Cargo.toml | 6 +++---
 src/rendering/font/mod.rs                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e6d46a02..4d7ed33e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ base64-simd = { version = "0.8.0", default-features = false, features = [
     "alloc",
 ] }
 bytemuck = { version = "1.9.1", default-features = false }
-bytemuck_derive = { version = "1.4.1", default_features = false }
+bytemuck_derive = { version = "1.4.1", default-features = false }
 cfg-if = "1.0.0"
 itoa = { version = "1.0.3", default-features = false }
 time = { version = "0.3.36", default-features = false }
@@ -51,7 +51,7 @@ simdutf8 = { git = "https://github.com/CryZe/simdutf8", branch = "wasm-ub-panic"
     "aarch64_neon",
 ] }
 serde = { version = "1.0.186", default-features = false, features = ["alloc"] }
-serde_derive = { version = "1.0.186", default_features = false }
+serde_derive = { version = "1.0.186", default-features = false }
 serde_json = { version = "1.0.60", default-features = false, features = [
     "alloc",
 ] }
diff --git a/crates/livesplit-auto-splitting/Cargo.toml b/crates/livesplit-auto-splitting/Cargo.toml
index a8400fa0..bda82de3 100644
--- a/crates/livesplit-auto-splitting/Cargo.toml
+++ b/crates/livesplit-auto-splitting/Cargo.toml
@@ -18,7 +18,7 @@ bstr = "1.10.0"
 bytemuck = { version = "1.14.0", features = ["min_const_generics"] }
 bytes = "1.6.1"
 indexmap = "2.0.2"
-proc-maps = { version = "0.3.0", default-features = false }
+proc-maps = { version = "0.4.0", default-features = false }
 read-process-memory = { version = "0.1.4", default-features = false }
 slotmap = { version = "1.0.2", default-features = false }
 snafu = "0.8.0"
@@ -27,13 +27,13 @@ sysinfo = { version = "0.32.0", default-features = false, features = [
   "system",
 ] }
 time = { version = "0.3.3", default-features = false }
-wasmtime = { version = "25.0.1", default-features = false, features = [
+wasmtime = { version = "26.0.0", default-features = false, features = [
   "cranelift",
   "gc",
   "parallel-compilation",
   "runtime",
 ] }
-wasmtime-wasi = { version = "25.0.1", default-features = false, features = [
+wasmtime-wasi = { version = "26.0.0", default-features = false, features = [
   "preview1",
 ] }
 
diff --git a/src/rendering/font/mod.rs b/src/rendering/font/mod.rs
index 3facec5d..b8dd1787 100644
--- a/src/rendering/font/mod.rs
+++ b/src/rendering/font/mod.rs
@@ -131,7 +131,7 @@ impl<L> CachedLabel<L> {
                     .as_ref()
                     .zip(max_width)
                     .zip(self.max_width)
-                    .map_or(true, |((l, max_width), old_max_width)| {
+                    .is_none_or(|((l, max_width), old_max_width)| {
                         // If both the current and old max width fall outside the
                         // range where the label would need to use ellipsis, then we
                         // can consider the label to not be dirty.