From cf10e2ff6d6c540ce2683cc0ce9d8a316ba45f03 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 5 Oct 2025 19:28:56 +0800
Subject: [PATCH] Use to the new panic-immediate-abort cargo feature

---
 app/src/main/cpp/CMakeLists.txt | 1 -
 app/src/main/rust/Cargo.toml    | 4 +++-
 rust-toolchain.toml             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 65dc26f7d..64cb0d985 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -145,7 +145,6 @@ corrosion_import_crate(
         FEATURES $<IF:$<VERSION_GREATER_EQUAL:${ANDROID_NATIVE_API_LEVEL},26>,android-26,android>
         FLAGS $<$<NOT:$<CONFIG:Debug>>:-Z build-std=std,panic_abort -Z build-std-features=>
 )
-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/app/src/main/rust/Cargo.toml b/app/src/main/rust/Cargo.toml
index 9c56f8083..30e60531c 100644
--- a/app/src/main/rust/Cargo.toml
+++ b/app/src/main/rust/Cargo.toml
@@ -1,3 +1,5 @@
+cargo-features = ["panic-immediate-abort"]
+
 [package]
 name = "ehviewer_rust"
 version = "0.0.0"
@@ -34,7 +36,7 @@ reqwest = "0.12"
 tokio = { version = "1", features = ["macros"] }
 
 [profile.release]
-panic = "abort"
+panic = "immediate-abort"
 strip = true
 lto = true
 codegen-units = 1
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 954fc037d..64656cfe9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2025-10-03"
+channel = "nightly-2025-10-05"
 components = ["rustfmt", "clippy", "rust-src"]
 targets = ["aarch64-linux-android", "x86_64-linux-android"]
 profile = "minimal"