mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-07 05:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove wasmer_engine_universal{,_artifact} and merge into wasmer_compiler

Browse Source
This commit is contained in:
Manos Pitsidianakis
2022-06-13 23:59:43 +03:00
parent 9ebe1c2e3a
commit 086205bfcc
74 changed files with 171 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cli/Cargo.toml
View File

@@ -31,7 +31,6 @@ wasmer-compiler-cranelift = { version = "=2.3.0", path = "../compiler-cranelift"
wasmer-compiler-singlepass = { version = "=2.3.0", path = "../compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "=2.3.0", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "=2.3.0", path = "../emscripten", optional = true }
wasmer-engine-universal = { version = "=2.3.0", path = "../engine-universal", optional = true }
wasmer-vm = { version = "=2.3.0", path = "../vm" }
wasmer-wasi = { version = "=2.3.0", path = "../wasi", optional = true }
wasmer-wasi-experimental-io-devices = { version = "=2.3.0", path = "../wasi-experimental-io-devices", optional = true }
@@ -69,7 +68,6 @@ default = [
]
engine = []
universal = [
"wasmer-engine-universal",
"engine",
]
cache = ["wasmer-cache"]
@@ -80,7 +78,6 @@ emscripten = ["wasmer-emscripten"]
wat = ["wasmer/wat"]
compiler = [
"wasmer-compiler/translator",
"wasmer-engine-universal/compiler",
]
experimental-io-devices = [
"wasmer-wasi-experimental-io-devices",

2
lib/cli/src/commands/compile.rs
View File

@@ -41,7 +41,7 @@ impl Compile {
Ok(match engine_type {
#[cfg(feature = "universal")]
EngineType::Universal => {
wasmer_engine_universal::UniversalArtifact::get_default_extension(target_triple)
wasmer_compiler::UniversalArtifact::get_default_extension(target_triple)
}
#[cfg(not(all(feature = "universal")))]
_ => bail!("selected engine type is not compiled in"),

6
lib/cli/src/commands/run.rs
View File

@@ -225,8 +225,8 @@ impl Run {
let contents = std::fs::read(self.path.clone())?;
#[cfg(feature = "universal")]
{
if wasmer_engine_universal::UniversalArtifact::is_deserializable(&contents) {
let engine = wasmer_engine_universal::Universal::headless().engine();
if wasmer_compiler::UniversalArtifact::is_deserializable(&contents) {
let engine = wasmer_compiler::Universal::headless().engine();
let store = Store::new(&engine);
let module = unsafe { Module::deserialize_from_file(&store, &self.path)? };
return Ok(module);
@@ -309,7 +309,7 @@ impl Run {
let extension = match *engine_type {
#[cfg(feature = "universal")]
EngineType::Universal => {
wasmer_engine_universal::UniversalArtifact::get_default_extension(&Triple::host())
wasmer_compiler::UniversalArtifact::get_default_extension(&Triple::host())
.to_string()
}
// We use the compiler type as the default extension

6
lib/cli/src/store.rs
View File

@@ -129,7 +129,7 @@ impl CompilerOptions {
let engine: Box<dyn Engine + Send + Sync> = match engine_type {
#[cfg(feature = "universal")]
EngineType::Universal => Box::new(
wasmer_engine_universal::Universal::new(compiler_config)
wasmer_compiler::Universal::new(compiler_config)
.features(features)
.target(target)
.engine(),
@@ -392,9 +392,7 @@ impl StoreOptions {
let engine_type = self.get_engine()?;
let engine: Arc<dyn Engine + Send + Sync> = match engine_type {
#[cfg(feature = "universal")]
EngineType::Universal => {
Arc::new(wasmer_engine_universal::Universal::headless().engine())
}
EngineType::Universal => Arc::new(wasmer_compiler::Universal::headless().engine()),
#[cfg(not(all(feature = "universal")))]
engine => bail!(
"The `{}` engine is not included in this binary.",