From 408b660490a8102046495aa405e20b471e1a3521 Mon Sep 17 00:00:00 2001 From: Ryan Walters Date: Thu, 18 Sep 2025 23:16:55 -0500 Subject: [PATCH] fix: drop unused fast_image_resize, drop toolchain back to 1.86, limit emscripten build to pacman project properly --- Cargo.lock | 30 ------------------------------ pacman-server/Cargo.toml | 7 +++++-- pacman/web.build.ts | 2 +- rust-toolchain.toml | 2 +- 4 files changed, 7 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e95eac2..fd439f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,15 +1227,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "document-features" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" -dependencies = [ - "litrs", -] - [[package]] name = "dotenvy" version = "0.15.7" @@ -1416,20 +1407,6 @@ dependencies = [ "zune-inflate", ] -[[package]] -name = "fast_image_resize" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd1eda71e8af93f8b00e189404235d82f4de77ea4a0d182b44a7f03994d647c" -dependencies = [ - "bytemuck", - "cfg-if 1.0.3", - "document-features", - "image", - "num-traits", - "thiserror 2.0.16", -] - [[package]] name = "fastrand" version = "2.3.0" @@ -2513,12 +2490,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" -[[package]] -name = "litrs" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" - [[package]] name = "lock_api" version = "0.3.4" @@ -3078,7 +3049,6 @@ dependencies = [ "chrono", "dashmap", "dotenvy", - "fast_image_resize", "figment", "http", "hyper", diff --git a/pacman-server/Cargo.toml b/pacman-server/Cargo.toml index 6b3d2ad..5418575 100644 --- a/pacman-server/Cargo.toml +++ b/pacman-server/Cargo.toml @@ -3,7 +3,7 @@ name = "pacman-server" version = "0.4.0" authors.workspace = true edition.workspace = true -rust-version = "1.87.0" +rust-version = "1.85.0" description = "A leaderboard API for the Pac-Man game" readme.workspace = true homepage.workspace = true @@ -18,6 +18,10 @@ default-run = "pacman-server" name = "pacman_server" path = "src/lib.rs" +# I have no idea why s3-tokio isn't being detected as a dependency, but it's not. +[package.metadata.cargo-machete] +ignored = ["s3-tokio"] + [dependencies] axum = { version = "0.8", features = ["macros"] } tokio = { version = "1", features = ["full"] } @@ -44,7 +48,6 @@ time = { version = "0.3", features = ["macros", "formatting"] } yansi = "1" s3-tokio = { version = "0.39.6", default-features = false } rustls = { version = "0.23", features = ["ring"] } -fast_image_resize = { version = "5.3", features = ["image"] } image = { version = "0.25", features = ["png", "jpeg"] } sha2 = "0.10" mockall = "0.13.1" diff --git a/pacman/web.build.ts b/pacman/web.build.ts index 8028e8a..3194df3 100644 --- a/pacman/web.build.ts +++ b/pacman/web.build.ts @@ -52,7 +52,7 @@ async function build(release: boolean, env: Record | null) { release ? "release" : "debug" }` ); - await $`cargo build --target=wasm32-unknown-emscripten ${ + await $`cargo build --target=wasm32-unknown-emscripten --package pacman ${ release ? "--release" : "" }`.env(env ?? undefined); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index ce5c46a..79d0262 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] # we are unfortunately pinned to 1.86.0 for some reason, bulk-memory-opt related issues on wasm32-unknown-emscripten -channel = "1.87.0" +channel = "1.86.0" components = ["rustfmt", "llvm-tools-preview", "clippy"]