mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-10 22:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into engine

Browse Source 
# Conflicts:
#	Cargo.toml
#	lib/api/Cargo.toml
#	lib/api/src/store.rs
This commit is contained in:
Syrus
2020-05-05 15:24:01 -07:00
parent 9ae23c76f3 a945b43c58
commit ab017f3737
31 changed files with 563 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/api/src/lib.rs
View File

@@ -33,17 +33,36 @@ pub use wasmer_compiler::{Features, Target};
pub use wasmer_engine::{
DeserializeError, Engine, InstantiationError, LinkError, RuntimeError, SerializeError,
};
#[cfg(feature = "engine-jit")]
pub use wasmer_engine_jit::JITEngine;
#[cfg(feature = "compiler-singlepass")]
// The compilers are mutually exclusive
#[cfg(any(
all(feature = "llvm", any(feature = "cranelift", feature = "singlepass")),
all(feature = "cranelift", feature = "singlepass")
))]
compile_error!(
r#"The `singlepass`, `cranelift` and `llvm` features are mutually exclusive.
If you wish to use more than one compiler, you can simply import it from it's own crate. Eg.:
```
use wasmer::{Store, Engine};
use wasmer_compiler_singlepass::SinglepassConfig;
let engine = Engine::new(SinglepassConfig::default());
let store = Store::new_config(&engine);
```"#
);
#[cfg(feature = "singlepass")]
pub use wasmer_compiler_singlepass::SinglepassConfig;
#[cfg(feature = "compiler-cranelift")]
#[cfg(feature = "cranelift")]
pub use wasmer_compiler_cranelift::CraneliftConfig;
#[cfg(feature = "compiler-llvm")]
#[cfg(feature = "llvm")]
pub use wasmer_compiler_llvm::LLVMConfig;
#[cfg(feature = "jit")]
pub use wasmer_engine_jit::JITEngine;
/// Version number of this crate.
pub const VERSION: &str = env!("CARGO_PKG_VERSION");