From a02c9083f8eecfad68af1e5a77ca3676fb2e8c1d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 25 Jan 2022 20:09:51 +0300
Subject: [PATCH] Make wasmer 0.x buildable with modern nightlies

---
 Cargo.lock                         | 2 +-
 lib/runtime-core/Cargo.toml        | 2 +-
 lib/runtime-core/src/lib.rs        | 1 -
 lib/runtime-core/src/typed_func.rs | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd19aa639a..9155963b66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2933,7 +2933,7 @@ dependencies = [
 
 [[package]]
 name = "wasmer-runtime-core-near"
-version = "0.18.2"
+version = "0.18.3"
 dependencies = [
  "bincode",
  "blake3",
diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml
index 6e2d70b0b1..9288dad2e5 100644
--- a/lib/runtime-core/Cargo.toml
+++ b/lib/runtime-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime-core-near"
-version = "0.18.2"
+version = "0.18.3"
 description = "Wasmer runtime core library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
diff --git a/lib/runtime-core/src/lib.rs b/lib/runtime-core/src/lib.rs
index 7b6168c5f1..d8bd3f5608 100644
--- a/lib/runtime-core/src/lib.rs
+++ b/lib/runtime-core/src/lib.rs
@@ -22,7 +22,6 @@
     unused_unsafe,
     unreachable_patterns
 )]
-#![cfg_attr(nightly, feature(unwind_attributes))]
 #![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
 #![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]
 
diff --git a/lib/runtime-core/src/typed_func.rs b/lib/runtime-core/src/typed_func.rs
index f158f15cc2..26ca88de13 100644
--- a/lib/runtime-core/src/typed_func.rs
+++ b/lib/runtime-core/src/typed_func.rs
@@ -614,7 +614,6 @@ macro_rules! impl_traits {
                 //
                 // It is also required for the LLVM backend to be
                 // able to unwind through this function.
-                #[cfg_attr(nightly, unwind(allowed))]
                 extern fn wrap<$( $x, )* Rets, Trap, FN>(
                     vmctx: &vm::Ctx $( , $x: <$x as WasmExternType>::Native )*
                 ) -> Rets::CStruct
@@ -731,7 +730,6 @@ macro_rules! impl_traits {
                 //
                 // It is also required for the LLVM backend to be
                 // able to unwind through this function.
-                #[cfg_attr(nightly, unwind(allowed))]
                 extern fn wrap<$( $x, )* Rets, Trap, FN>(
                     vmctx: &vm::Ctx $( , $x: <$x as WasmExternType>::Native )*
                 ) -> Rets::CStruct