From 085e0938cba98a5e961431660d137d492b41c54a Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Thu, 2 Oct 2025 15:18:30 +0800
Subject: [PATCH] Downgrade rust-nightly to 2025-09-23

2025-09-24 and later have a +25% (141KB) binary size regression

This reverts commit 9a2c0d7121c004bf131a6d131a964fd96dfb3c39.
---
 app/src/main/cpp/CMakeLists.txt | 3 +--
 rust-toolchain.toml             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index c26c1fb46..c23c74361 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -143,9 +143,8 @@ corrosion_import_crate(
         MANIFEST_PATH ../rust/Cargo.toml
         LOCKED
         FEATURES $<IF:$<VERSION_GREATER_EQUAL:${ANDROID_NATIVE_API_LEVEL},26>,android-26,android>
-        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std=std,panic_abort>
+        FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort>
 )
-corrosion_add_target_rustflags(ehviewer_rust $<$<NOT:$<CONFIG:Debug>>:-Z unstable-options -C panic=immediate-abort>)
 corrosion_link_libraries(ehviewer_rust android jnigraphics log webp webpdemux)
 
 # Build and link our app's native lib
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 222ab3da1..fb5d6858f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2025-10-01"
+channel = "nightly-2025-09-23"
 components = ["rustfmt", "clippy", "rust-src"]
 targets = ["aarch64-linux-android", "x86_64-linux-android"]
 profile = "minimal"