Merge branch 'master' into native-engine

# Conflicts: # Cargo.lock
2025-12-10 22:58:18 +00:00 · 2020-05-19 13:45:39 -07:00
parent c04dec4e25 9d28bd8c62
commit d2526adc15
24 changed files with 3536 additions and 3328 deletions
--- a/lib/api/src/lib.rs
+++ b/lib/api/src/lib.rs
@@ -34,7 +34,7 @@ pub use wasmer_compiler::{Features, Target};
 pub use wasmer_engine::{
    DeserializeError, Engine, InstantiationError, LinkError, RuntimeError, SerializeError,
 };
-pub use wasmer_runtime::MemoryError;
+pub use wasmer_runtime::{raise_user_trap, MemoryError};

 // The compilers are mutually exclusive
 #[cfg(any(