From ccbc02772972477cc77bbc163733dc4aa4dddc05 Mon Sep 17 00:00:00 2001
From: alyssa <alyssa@mailc.net>
Date: Sun, 7 Sep 2025 17:18:27 +0000
Subject: [PATCH] chore: fix rust build

---
 Cargo.lock                    | 58 ++++++++++++++++++++++++-----------
 crates/avatars/Cargo.toml     |  2 +-
 crates/avatars/src/process.rs |  4 +--
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1628247e..858c207a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,7 +180,7 @@ dependencies = [
  "form_urlencoded",
  "futures",
  "gif",
- "image 0.24.9",
+ "image",
  "libpk",
  "reqwest 0.12.15",
  "rust-s3",
@@ -1837,22 +1837,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "image"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "gif",
- "jpeg-decoder",
- "num-traits",
- "png",
- "tiff",
-]
-
 [[package]]
 name = "image"
 version = "0.25.6"
@@ -1861,7 +1845,24 @@ checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
+ "color_quant",
+ "gif",
+ "image-webp",
  "num-traits",
+ "png",
+ "tiff",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
 ]
 
 [[package]]
@@ -2666,6 +2667,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quick-xml"
 version = "0.26.0"
@@ -4852,7 +4859,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c071456adef4aca59bf6a583c46b90ff5eb0b4f758fc347cea81290288f37ce1"
 dependencies = [
- "image 0.25.6",
+ "image",
  "libwebp-sys",
 ]
 
@@ -5516,3 +5523,18 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
+dependencies = [
+ "zune-core",
+]
diff --git a/crates/avatars/Cargo.toml b/crates/avatars/Cargo.toml
index 01cea291..f6dfb96f 100644
--- a/crates/avatars/Cargo.toml
+++ b/crates/avatars/Cargo.toml
@@ -21,7 +21,7 @@ uuid = { workspace = true }
 
 data-encoding = "2.5.0"
 gif = "0.13.1"
-image = { version = "0.24.8", default-features = false, features = ["gif", "jpeg", "png", "webp", "tiff"] }
+image = { version = "0.25.6", default-features = false, features = ["gif", "jpeg", "png", "webp", "tiff"] }
 form_urlencoded = "1.2.1"
 rust-s3 = { version = "0.33.0", default-features = false, features = ["tokio-rustls-tls"] }
 sha2 = "0.10.8"
diff --git a/crates/avatars/src/process.rs b/crates/avatars/src/process.rs
index 0c9ba8c1..99ae2d36 100644
--- a/crates/avatars/src/process.rs
+++ b/crates/avatars/src/process.rs
@@ -211,8 +211,8 @@ fn process_gif_inner(
     }))
 }
 
-fn reader_for(data: &[u8]) -> image::io::Reader<Cursor<&[u8]>> {
-    image::io::Reader::new(Cursor::new(data))
+fn reader_for(data: &[u8]) -> image::ImageReader<Cursor<&[u8]>> {
+    image::ImageReader::new(Cursor::new(data))
         .with_guessed_format()
         .expect("cursor i/o is infallible")
 }