fix(rust): Support new alloc panic handling (#2582)

examples/binaries/async-tester/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 use codec::{Decode, Encode};
 

examples/binaries/exit-handle-sender/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};

examples/binaries/exit-handle/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]

examples/binaries/exit-init/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]

examples/binaries/gas-burned/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]

examples/binaries/init-fail-sender/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]

examples/binaries/init-wait-reply-exit/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]

examples/binaries/init-wait/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(feature = "std")]

examples/binaries/node/src/lib.rs

@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 extern crate alloc;

examples/ping/src/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(alloc_error_handler)]
 
 #[cfg(target_arch = "wasm32")]
 extern crate galloc;
@@ -20,12 +19,6 @@ extern "C" fn handle() {
     }
 }
 
-#[cfg(target_arch = "wasm32")]
-#[alloc_error_handler]
-pub fn oom(_: core::alloc::Layout) -> ! {
-    core::arch::wasm32::unreachable()
-}
-
 #[cfg(target_arch = "wasm32")]
 #[panic_handler]
 fn panic(_: &core::panic::PanicInfo) -> ! {

gcli/res/messager/src/lib.rs

@@ -16,7 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
 #![cfg_attr(not(feature = "std"), feature(const_btree_new))]
 #![cfg_attr(not(feature = "std"), no_std)]
 

gcore/src/lib.rs

@@ -31,7 +31,6 @@
 //!
 //! ```
 //! #![no_std]
-//! #![feature(alloc_error_handler)]
 //!
 //! extern crate galloc;
 //!
@@ -49,12 +48,6 @@
 //! }
 //!
 //! # #[cfg(target = "wasm32")]
-//! #[alloc_error_handler]
-//! pub fn oom(_: core::alloc::Layout) -> ! {
-//!     core::arch::wasm32::unreachable()
-//! }
-//!
-//! # #[cfg(target = "wasm32")]
 //! #[panic_handler]
 //! fn panic(_: &core::panic::PanicInfo) -> ! {
 //!     core::arch::wasm32::unreachable()

gcore/src/utils.rs

@@ -68,19 +68,13 @@ pub mod ext {
     ///
     /// ```rust,ignore
     /// #![no_std]
-    /// #![feature(alloc_error_handler)]
     /// #![feature(allocator_api)]
     ///
     /// extern crate alloc;
     ///
-    /// use alloc::alloc::{Global, Layout, Allocator};
+    /// use alloc::alloc::{Global, Allocator};
     /// use gcore::ext;
     ///
-    /// #[alloc_error_handler]
-    /// fn oom(_layout: Layout) -> ! {
-    ///     ext::oom_panic()
-    /// }
-    ///
     /// #[no_mangle]
     /// extern "C" fn handle() {
     ///     let layout = Layout::new::<[u8; 64 * 1024]>();

gstd/src/common/handlers.rs

@@ -26,19 +26,23 @@
 //! For `debug` mode it provides more extensive logging.
 
 #[cfg(target_arch = "wasm32")]
-use {crate::ext, core::alloc::Layout, core::panic::PanicInfo};
-
-#[cfg(target_arch = "wasm32")]
-#[alloc_error_handler]
-pub fn oom(_: Layout) -> ! {
-    ext::oom_panic()
-}
+use {crate::ext, alloc::alloc::AllocErrorPanicPayload, core::panic::PanicInfo};
 
 #[cfg(not(feature = "debug"))]
 #[cfg(not(debug_assertions))]
 #[cfg(target_arch = "wasm32")]
 #[panic_handler]
-pub fn panic(_: &PanicInfo) -> ! {
+pub fn panic(panic_info: &PanicInfo) -> ! {
+    // Alloc error handling through panic message.
+    if panic_info
+        .payload()
+        .downcast_ref::<AllocErrorPanicPayload>()
+        .is_some()
+    {
+        ext::oom_panic()
+    }
+
+    // Common panic handling.
     ext::panic("no info")
 }
 
@@ -48,6 +52,16 @@ pub fn panic(_: &PanicInfo) -> ! {
 pub fn panic(panic_info: &PanicInfo) -> ! {
     use crate::prelude::format;
 
+    // Alloc error handling through panic message.
+    if panic_info
+        .payload()
+        .downcast_ref::<AllocErrorPanicPayload>()
+        .is_some()
+    {
+        ext::oom_panic()
+    }
+
+    // Common panic handling.
     let msg = match (panic_info.message(), panic_info.location()) {
         (Some(msg), Some(loc)) => format!(
             "'{:?}', {}:{}:{}",

gstd/src/lib.rs

@@ -140,10 +140,11 @@
     all(target_arch = "wasm32", any(feature = "debug", debug_assertions)),
     feature(panic_info_message)
 )]
-#![cfg_attr(target_arch = "wasm32", feature(alloc_error_handler))]
+#![cfg_attr(target_arch = "wasm32", feature(panic_oom_payload))]
 #![cfg_attr(feature = "strict", deny(warnings))]
 #![doc(html_logo_url = "https://docs.gear.rs/logo.svg")]
 
+extern crate alloc;
 #[cfg(target_arch = "wasm32")]
 extern crate galloc;
 

gstd/src/prelude.rs

@@ -19,8 +19,6 @@
 //! The `gstd` default prelude. Re-imports default `std` modules and traits.
 //! `std` can be safely replaced to `gstd` in the Rust programs.
 
-extern crate alloc;
-
 pub use core::prelude::v1::*;
 
 // Public module re-exports