Remove wasmer_engine_universal{,_artifact} and merge into wasmer_compiler

lib/cli-compiler/Cargo.toml

@@ -18,8 +18,7 @@ path = "src/bin/wasmer_compiler.rs"
 doc = false
 
 [dependencies]
-wasmer-engine-universal-artifact = { version = "=2.3.0", path = "../universal-artifact", features = ["compiler"] }
-wasmer-compiler = { version = "=2.3.0", path = "../compiler" }
+wasmer-compiler = { version = "=2.3.0", path = "../compiler", features = ["universal_engine"] }
 wasmer-types = { version = "=2.3.0", path = "../types" }
 atty = "0.2"
 colored = "2.0"

lib/cli-compiler/src/commands/compile.rs

@@ -3,8 +3,8 @@ use crate::warning;
 use anyhow::{Context, Result};
 use std::path::{Path, PathBuf};
 use structopt::StructOpt;
+use wasmer_compiler::{ArtifactCreate, UniversalArtifactBuild};
 use wasmer_compiler::{CpuFeature, ModuleEnvironment, Target, Triple};
-use wasmer_engine_universal_artifact::{ArtifactCreate, UniversalArtifactBuild};
 use wasmer_types::entity::PrimaryMap;
 use wasmer_types::{CompileError, MemoryIndex, MemoryStyle, TableIndex, TableStyle};
 
@@ -43,9 +43,7 @@ impl Compile {
     ) -> Result<&'static str> {
         Ok(match engine_type {
             EngineType::Universal => {
-                wasmer_engine_universal_artifact::UniversalArtifactBuild::get_default_extension(
-                    target_triple,
-                )
+                wasmer_compiler::UniversalArtifactBuild::get_default_extension(target_triple)
             }
         })
     }

lib/cli-compiler/src/store.rs

@@ -7,8 +7,8 @@ use std::string::ToString;
 #[allow(unused_imports)]
 use std::sync::Arc;
 use structopt::StructOpt;
+use wasmer_compiler::UniversalEngineBuilder;
 use wasmer_compiler::{CompilerConfig, Features, PointerWidth, Target};
-use wasmer_engine_universal_artifact::UniversalEngineBuilder;
 use wasmer_types::{MemoryStyle, MemoryType, Pages, TableStyle, TableType};
 
 /// Minimul Subset of Tunable parameters for WebAssembly compilation.