diff --git a/lib/deprecated/runtime-core/Cargo.lock b/lib/deprecated/runtime-core/Cargo.lock index 463e1d53e..11e843f97 100644 --- a/lib/deprecated/runtime-core/Cargo.lock +++ b/lib/deprecated/runtime-core/Cargo.lock @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "bincode" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf" +checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" dependencies = [ "byteorder", "serde", @@ -1043,7 +1043,7 @@ dependencies = [ "wasmer-engine", "wasmer-engine-jit", "wasmer-engine-native", - "wasmer-runtime", + "wasmer-vm", "wat", "winapi", ] @@ -1071,7 +1071,7 @@ dependencies = [ "target-lexicon", "thiserror", "wasm-common", - "wasmer-runtime", + "wasmer-vm", "wasmparser", ] @@ -1088,7 +1088,7 @@ dependencies = [ "tracing", "wasm-common", "wasmer-compiler", - "wasmer-runtime", + "wasmer-vm", ] [[package]] @@ -1110,7 +1110,7 @@ dependencies = [ "target-lexicon", "wasm-common", "wasmer-compiler", - "wasmer-runtime", + "wasmer-vm", ] [[package]] @@ -1127,7 +1127,7 @@ dependencies = [ "smallvec", "wasm-common", "wasmer-compiler", - "wasmer-runtime", + "wasmer-vm", ] [[package]] @@ -1138,7 +1138,6 @@ dependencies = [ "bincode", "lazy_static", "more-asserts", - "region", "rustc-demangle", "serde", "serde_bytes", @@ -1146,7 +1145,7 @@ dependencies = [ "thiserror", "wasm-common", "wasmer-compiler", - "wasmer-runtime", + "wasmer-vm", "winapi", ] @@ -1162,7 +1161,7 @@ dependencies = [ "wasm-common", "wasmer-compiler", "wasmer-engine", - "wasmer-runtime", + "wasmer-vm", "winapi", ] @@ -1182,7 +1181,7 @@ dependencies = [ "wasmer-compiler", "wasmer-engine", "wasmer-object", - "wasmer-runtime", + "wasmer-vm", ] [[package]] @@ -1196,7 +1195,21 @@ dependencies = [ ] [[package]] -name = "wasmer-runtime" +name = "wasmer-runtime-core" +version = "1.0.0-alpha.1" +dependencies = [ + "blake3", + "lazy_static", + "wasm-common", + "wasmer", + "wasmer-cache", + "wasmer-compiler", + "wasmer-engine", + "wasmer-vm", +] + +[[package]] +name = "wasmer-vm" version = "1.0.0-alpha.1" dependencies = [ "backtrace", @@ -1213,20 +1226,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wasmer-runtime-core" -version = "1.0.0-alpha.1" -dependencies = [ - "blake3", - "lazy_static", - "wasm-common", - "wasmer", - "wasmer-cache", - "wasmer-compiler", - "wasmer-engine", - "wasmer-runtime", -] - [[package]] name = "wasmparser" version = "0.57.0" diff --git a/lib/deprecated/runtime-core/Cargo.toml b/lib/deprecated/runtime-core/Cargo.toml index d386e988f..743ce738a 100644 --- a/lib/deprecated/runtime-core/Cargo.toml +++ b/lib/deprecated/runtime-core/Cargo.toml @@ -15,7 +15,7 @@ wasmer = { path = "../../api", version = "1.0.0-alpha.1" } wasmer-cache = { path = "../../cache", version = "1.0.0-alpha.1" } wasmer-compiler = { path = "../../compiler", version = "1.0.0-alpha.1", features = ["translator"] } wasmer-engine = { path = "../../engine", version = "1.0.0-alpha.1" } -wasmer-runtime = { path = "../../runtime", version = "1.0.0-alpha.1" } +wasmer-vm = { path = "../../vm", version = "1.0.0-alpha.1" } lazy_static = "1.4" [build-dependencies] diff --git a/lib/deprecated/runtime-core/src/export.rs b/lib/deprecated/runtime-core/src/export.rs index ae2d93baf..359822b8d 100644 --- a/lib/deprecated/runtime-core/src/export.rs +++ b/lib/deprecated/runtime-core/src/export.rs @@ -1,4 +1,4 @@ pub use crate::new::{ wasmer::{Exportable, Extern as Export}, - wasmer_runtime::Export as RuntimeExport, + wasmer_vm::Export as RuntimeExport, }; diff --git a/lib/deprecated/runtime-core/src/global.rs b/lib/deprecated/runtime-core/src/global.rs index dc4d4aaa1..67f3264df 100644 --- a/lib/deprecated/runtime-core/src/global.rs +++ b/lib/deprecated/runtime-core/src/global.rs @@ -87,7 +87,7 @@ impl From<&new::wasmer::Global> for Global { } impl<'a> new::wasmer::Exportable<'a> for Global { - fn to_export(&self) -> new::wasmer_runtime::Export { + fn to_export(&self) -> new::wasmer_vm::Export { self.new_global.to_export() } diff --git a/lib/deprecated/runtime-core/src/import.rs b/lib/deprecated/runtime-core/src/import.rs index e3e39a2b5..148421de5 100644 --- a/lib/deprecated/runtime-core/src/import.rs +++ b/lib/deprecated/runtime-core/src/import.rs @@ -30,11 +30,11 @@ impl Namespace { } impl LikeNamespace for Namespace { - fn get_namespace_export(&self, name: &str) -> Option { + fn get_namespace_export(&self, name: &str) -> Option { self.exports.new_exports.get_namespace_export(name) } - fn get_namespace_exports(&self) -> Vec<(String, new::wasmer_runtime::Export)> { + fn get_namespace_exports(&self) -> Vec<(String, new::wasmer_vm::Export)> { self.exports.new_exports.get_namespace_exports() } } diff --git a/lib/deprecated/runtime-core/src/instance.rs b/lib/deprecated/runtime-core/src/instance.rs index 9a30f2ca8..8bc6bd4f5 100644 --- a/lib/deprecated/runtime-core/src/instance.rs +++ b/lib/deprecated/runtime-core/src/instance.rs @@ -222,11 +222,11 @@ impl Instance { } impl LikeNamespace for Instance { - fn get_namespace_export(&self, name: &str) -> Option { + fn get_namespace_export(&self, name: &str) -> Option { self.exports.new_exports.get_namespace_export(name) } - fn get_namespace_exports(&self) -> Vec<(String, new::wasmer_runtime::Export)> { + fn get_namespace_exports(&self) -> Vec<(String, new::wasmer_vm::Export)> { self.exports.new_exports.get_namespace_exports() } } @@ -256,11 +256,11 @@ impl Exports { } impl LikeNamespace for Exports { - fn get_namespace_export(&self, name: &str) -> Option { + fn get_namespace_export(&self, name: &str) -> Option { self.new_exports.get_namespace_export(name) } - fn get_namespace_exports(&self) -> Vec<(String, new::wasmer_runtime::Export)> { + fn get_namespace_exports(&self) -> Vec<(String, new::wasmer_vm::Export)> { self.new_exports.get_namespace_exports() } } diff --git a/lib/deprecated/runtime-core/src/lib.rs b/lib/deprecated/runtime-core/src/lib.rs index 27a07a56d..9f51661df 100644 --- a/lib/deprecated/runtime-core/src/lib.rs +++ b/lib/deprecated/runtime-core/src/lib.rs @@ -45,7 +45,7 @@ pub(crate) mod new { pub use wasmer_cache; pub use wasmer_compiler; pub use wasmer_engine; - pub use wasmer_runtime; + pub use wasmer_vm; } pub mod backend; diff --git a/lib/deprecated/runtime-core/src/memory.rs b/lib/deprecated/runtime-core/src/memory.rs index 6050f77d0..4ae8bae87 100644 --- a/lib/deprecated/runtime-core/src/memory.rs +++ b/lib/deprecated/runtime-core/src/memory.rs @@ -11,7 +11,7 @@ pub mod ptr { pub use new::wasm_common::MemoryType as MemoryDescriptor; pub use new::wasmer::{Atomically, MemoryView}; -pub use new::wasmer_runtime::MemoryStyle as MemoryType; +pub use new::wasmer_vm::MemoryStyle as MemoryType; /// A Wasm linear memory. /// @@ -108,7 +108,7 @@ impl From<&new::wasmer::Memory> for Memory { } impl<'a> new::wasmer::Exportable<'a> for Memory { - fn to_export(&self) -> new::wasmer_runtime::Export { + fn to_export(&self) -> new::wasmer_vm::Export { self.new_memory.to_export() } diff --git a/lib/deprecated/runtime-core/src/module.rs b/lib/deprecated/runtime-core/src/module.rs index 243367633..dca11e835 100644 --- a/lib/deprecated/runtime-core/src/module.rs +++ b/lib/deprecated/runtime-core/src/module.rs @@ -8,7 +8,7 @@ use crate::{ types::{FuncSig, Value}, vm, }; -use new::wasmer_runtime::Export; +use new::wasmer_vm::Export; use std::{ cell::RefCell, collections::HashMap, @@ -17,7 +17,7 @@ use std::{ }; pub use new::wasm_common::{DataInitializer, ExportIndex}; -pub use new::wasmer_runtime::{ +pub use new::wasmer_vm::{ // MemoryStyle as MemoryType, ModuleInfo, @@ -145,7 +145,7 @@ impl Module { // stored by // `new::wasmer::Function::new_dynamic_env`. let vmctx: Box< - new::wasmer_runtime::VMDynamicFunctionContext< + new::wasmer_vm::VMDynamicFunctionContext< VMDynamicFunctionWithEnv, >, > = unsafe { Box::from_raw(function.vmctx as *mut _) }; diff --git a/lib/deprecated/runtime-core/src/table.rs b/lib/deprecated/runtime-core/src/table.rs index 8a5e869a3..80fa836d1 100644 --- a/lib/deprecated/runtime-core/src/table.rs +++ b/lib/deprecated/runtime-core/src/table.rs @@ -70,7 +70,7 @@ impl From<&new::wasmer::Table> for Table { } impl<'a> new::wasmer::Exportable<'a> for Table { - fn to_export(&self) -> new::wasmer_runtime::Export { + fn to_export(&self) -> new::wasmer_vm::Export { self.new_table.to_export() } diff --git a/lib/deprecated/runtime-core/src/typed_func.rs b/lib/deprecated/runtime-core/src/typed_func.rs index 1d71bf130..4b6425355 100644 --- a/lib/deprecated/runtime-core/src/typed_func.rs +++ b/lib/deprecated/runtime-core/src/typed_func.rs @@ -198,7 +198,7 @@ where Args: WasmTypeList, Rets: WasmTypeList, { - fn to_export(&self) -> new::wasmer_runtime::Export { + fn to_export(&self) -> new::wasmer_vm::Export { self.new_function.to_export() } @@ -307,7 +307,7 @@ impl From<&new::wasmer::Function> for DynamicFunc { } impl<'a> new::wasmer::Exportable<'a> for DynamicFunc { - fn to_export(&self) -> new::wasmer_runtime::Export { + fn to_export(&self) -> new::wasmer_vm::Export { self.new_function.to_export() }