Make wasmer 0.x buildable with modern nightlies

near · Jan 25, 2022 · a02c908 · a02c908
1 parent 838d09b
commit a02c908
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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