Refactor last traces of "Universal" nomenclature

Cargo.toml

@@ -11,7 +11,7 @@ autoexamples = false
 
 [dependencies]
 wasmer = { version = "=2.3.0", path = "lib/api", default-features = false }
-wasmer-compiler = { version = "=2.3.0", path = "lib/compiler", features = ["universal_engine"] }
+wasmer-compiler = { version = "=2.3.0", path = "lib/compiler", features = ["engine_compilation"] }
 wasmer-compiler-cranelift = { version = "=2.3.0", path = "lib/compiler-cranelift", optional = true }
 wasmer-compiler-singlepass = { version = "=2.3.0", path = "lib/compiler-singlepass", optional = true }
 wasmer-compiler-llvm = { version = "=2.3.0", path = "lib/compiler-llvm", optional = true }

lib/api/Cargo.toml

@@ -105,7 +105,7 @@ default-llvm = ["default-compiler", "llvm"]
 # - Engines.
 engine = ["sys"]
 universal = [
-    "engine", "wasmer-compiler/universal_engine"
+    "engine", "wasmer-compiler/engine_compilation"
 ]
 default-engine = []
 default-universal = [

lib/c-api/Cargo.toml

@@ -59,7 +59,7 @@ middlewares = [
     "wasmer-middlewares",
 ]
 universal = [
-    "wasmer-compiler/universal_engine",
+    "wasmer-compiler/engine_compilation",
     "compiler",
 ]
 compiler = [

lib/cli-compiler/Cargo.toml

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

lib/cli/Cargo.toml

@@ -26,7 +26,7 @@ required-features = ["headless"]
 
 [dependencies]
 wasmer = { version = "=2.3.0", path = "../api", default-features = false }
-wasmer-compiler = { version = "=2.3.0", path = "../compiler", features = ["universal_engine", ] }
+wasmer-compiler = { version = "=2.3.0", path = "../compiler", features = ["engine_compilation", ] }
 wasmer-compiler-cranelift = { version = "=2.3.0", path = "../compiler-cranelift", optional = true }
 wasmer-compiler-singlepass = { version = "=2.3.0", path = "../compiler-singlepass", optional = true }
 wasmer-compiler-llvm = { version = "=2.3.0", path = "../compiler-llvm", optional = true }

lib/compiler/Cargo.toml

@@ -43,7 +43,7 @@ default = ["std", "enable-serde" ]
 # `CompilerConfig`, as well as the included wasmparser.
 # Disable this feature if you just want a headless engine.
 translator = ["wasmparser"]
-universal_engine = []
+engine_compilation = []
 std = ["wasmer-types/std"]
 core = ["hashbrown", "wasmer-types/core"]
 enable-serde = ["serde", "serde_bytes", "wasmer-types/enable-serde"]

lib/compiler/src/universal_artifact/artifact.rs → lib/compiler/src/artifact_builders/artifact_builder.rs

@@ -1,17 +1,17 @@
 //! Define `ArtifactBuild` to allow compiling and instantiating to be
 //! done as separate steps.
 
-#[cfg(feature = "universal_engine")]
+#[cfg(feature = "engine_compilation")]
 use super::trampoline::{libcall_trampoline_len, make_libcall_trampolines};
 use crate::Features;
 use crate::MetadataHeader;
 use crate::{ArtifactCreate, EngineBuilder};
-#[cfg(feature = "universal_engine")]
+#[cfg(feature = "engine_compilation")]
 use crate::{ModuleEnvironment, ModuleMiddlewareChain};
 use enumset::EnumSet;
 use std::mem;
 use wasmer_types::entity::PrimaryMap;
-#[cfg(feature = "universal_engine")]
+#[cfg(feature = "engine_compilation")]
 use wasmer_types::CompileModuleInfo;
 use wasmer_types::SerializeError;
 use wasmer_types::{
@@ -38,7 +38,7 @@ impl ArtifactBuild {
     }
 
     /// Compile a data buffer into a `ArtifactBuild`, which may then be instantiated.
-    #[cfg(feature = "universal_engine")]
+    #[cfg(feature = "engine_compilation")]
     pub fn new(
         inner_engine: &mut EngineBuilder,
         data: &[u8],
@@ -117,7 +117,7 @@ impl ArtifactBuild {
     }
 
     /// Compile a data buffer into a `ArtifactBuild`, which may then be instantiated.
-    #[cfg(not(feature = "universal_engine"))]
+    #[cfg(not(feature = "engine_compilation"))]
     pub fn new(_engine: &EngineBuilder, _data: &[u8]) -> Result<Self, CompileError> {
         Err(CompileError::Codegen(
             "Compilation is not enabled in the engine".to_string(),

lib/compiler/src/artifact_builders/mod.rs

@@ -0,0 +1,9 @@
+//! Generic Artifact abstraction for Wasmer Engines.
+
+mod artifact_builder;
+mod engine_builder;
+mod trampoline;
+
+pub use self::artifact_builder::ArtifactBuild;
+pub use self::engine_builder::EngineBuilder;
+pub use self::trampoline::*;

lib/compiler/src/engine/universal/artifact.rs → lib/compiler/src/engine/artifact.rs

@@ -1,12 +1,12 @@
 //! Define `Artifact`, based on `ArtifactBuild`
 //! to allow compiling and instantiating to be done as separate steps.
 
-use super::engine::{Engine, EngineInner};
-use crate::engine::universal::link::link_module;
+use crate::engine::engine::{Engine, EngineInner};
+use crate::engine::link::link_module;
 use crate::ArtifactBuild;
 use crate::ArtifactCreate;
 use crate::Features;
-#[cfg(feature = "universal_engine")]
+#[cfg(feature = "engine_compilation")]
 use crate::ModuleEnvironment;
 use crate::{
     register_frame_info, resolve_imports, FunctionExtent, GlobalFrameInfoRegistration,
@@ -37,7 +37,7 @@ pub struct Artifact {
 
 impl Artifact {
     /// Compile a data buffer into a `ArtifactBuild`, which may then be instantiated.
-    #[cfg(feature = "universal_engine")]
+    #[cfg(feature = "engine_compilation")]
     pub fn new(
         engine: &Engine,
         data: &[u8],
@@ -70,7 +70,7 @@ impl Artifact {
     }
 
     /// Compile a data buffer into a `ArtifactBuild`, which may then be instantiated.
-    #[cfg(not(feature = "universal_engine"))]
+    #[cfg(not(feature = "engine_compilation"))]
     pub fn new(_engine: &Engine, _data: &[u8]) -> Result<Self, CompileError> {
         Err(CompileError::Codegen(
             "Compilation is not enabled in the engine".to_string(),

lib/compiler/src/engine/universal/builder.rs → lib/compiler/src/engine/backend.rs

@@ -45,7 +45,7 @@ impl Backend {
     }
 
     /// Build the `Engine` for this configuration
-    #[cfg(feature = "universal_engine")]
+    #[cfg(feature = "engine_compilation")]
     pub fn engine(self) -> Engine {
         let target = self.target.unwrap_or_default();
         if let Some(compiler_config) = self.compiler_config {
@@ -60,7 +60,7 @@ impl Backend {
     }
 
     /// Build the `Engine` for this configuration
-    #[cfg(not(feature = "universal_engine"))]
+    #[cfg(not(feature = "engine_compilation"))]
     pub fn engine(self) -> Engine {
         Engine::headless()
     }

lib/compiler/src/engine/universal/engine.rs → lib/compiler/src/engine/engine.rs

@@ -1,6 +1,6 @@
 //! Universal compilation.
 
-#[cfg(feature = "universal_engine")]
+#[cfg(feature = "engine_compilation")]
 use crate::Compiler;
 use crate::EngineBuilder;
 use crate::{Artifact, CodeMemory};
@@ -32,7 +32,7 @@ pub struct Engine {
 
 impl Engine {
     /// Create a new `Engine` with the given config
-    #[cfg(feature = "universal_engine")]
+    #[cfg(feature = "engine_compilation")]
     pub fn new(compiler: Box<dyn Compiler>, target: Target, features: Features) -> Self {
         Self {
             inner: Arc::new(Mutex::new(EngineInner {
@@ -101,7 +101,7 @@ impl Engine {
     }
 
     /// Compile a WebAssembly binary
-    #[cfg(feature = "universal_engine")]
+    #[cfg(feature = "engine_compilation")]
     pub fn compile(
         &self,
         binary: &[u8],
@@ -111,7 +111,7 @@ impl Engine {
     }
 
     /// Compile a WebAssembly binary
-    #[cfg(not(feature = "universal_engine"))]
+    #[cfg(not(feature = "engine_compilation"))]
     pub fn compile(
         &self,
         _binary: &[u8],
@@ -174,7 +174,7 @@ pub struct EngineInner {
 
 impl EngineInner {
     /// Gets the compiler associated to this engine.
-    #[cfg(feature = "universal_engine")]
+    #[cfg(feature = "engine_compilation")]
     pub fn compiler(&self) -> Result<&dyn Compiler, CompileError> {
         self.builder.compiler()
     }

lib/compiler/src/engine/mod.rs

@@ -6,12 +6,30 @@ mod trap;
 mod tunables;
 
 #[cfg(feature = "translator")]
-mod universal;
+mod artifact;
+#[cfg(feature = "translator")]
+mod backend;
+#[cfg(feature = "translator")]
+mod code_memory;
+#[cfg(feature = "translator")]
+mod engine;
+#[cfg(feature = "translator")]
+mod link;
+#[cfg(feature = "translator")]
+mod unwind;
 
 pub use self::error::{InstantiationError, LinkError};
 pub use self::resolver::resolve_imports;
 pub use self::trap::*;
 pub use self::tunables::Tunables;
 
 #[cfg(feature = "translator")]
-pub use self::universal::*;
+pub use self::artifact::Artifact;
+#[cfg(feature = "translator")]
+pub use self::backend::Backend;
+#[cfg(feature = "translator")]
+pub use self::code_memory::CodeMemory;
+#[cfg(feature = "translator")]
+pub use self::engine::Engine;
+#[cfg(feature = "translator")]
+pub use self::link::link_module;

lib/compiler/src/lib.rs

@@ -51,19 +51,19 @@ mod lib {
     }
 }
 
-mod artifact;
 #[cfg(not(target_arch = "wasm32"))]
 mod engine;
+mod traits;
 
-pub use crate::artifact::*;
 #[cfg(not(target_arch = "wasm32"))]
 pub use crate::engine::*;
+pub use crate::traits::*;
 
 #[cfg(feature = "translator")]
-mod universal_artifact;
+mod artifact_builders;
 
 #[cfg(feature = "translator")]
-pub use self::universal_artifact::*;
+pub use self::artifact_builders::*;
 
 #[cfg(feature = "translator")]
 mod compiler;