feat(deprecated) Rename wasmer-runtime to wasmer-vm.

This commit is contained in:
Ivan Enderlin
2020-07-09 10:50:03 +02:00
parent 2f5169ec11
commit 4b0775c64f
11 changed files with 43 additions and 44 deletions

View File

@@ -51,9 +51,9 @@ dependencies = [
[[package]] [[package]]
name = "bincode" name = "bincode"
version = "1.2.1" version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf" checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"serde", "serde",
@@ -1043,7 +1043,7 @@ dependencies = [
"wasmer-engine", "wasmer-engine",
"wasmer-engine-jit", "wasmer-engine-jit",
"wasmer-engine-native", "wasmer-engine-native",
"wasmer-runtime", "wasmer-vm",
"wat", "wat",
"winapi", "winapi",
] ]
@@ -1071,7 +1071,7 @@ dependencies = [
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasm-common", "wasm-common",
"wasmer-runtime", "wasmer-vm",
"wasmparser", "wasmparser",
] ]
@@ -1088,7 +1088,7 @@ dependencies = [
"tracing", "tracing",
"wasm-common", "wasm-common",
"wasmer-compiler", "wasmer-compiler",
"wasmer-runtime", "wasmer-vm",
] ]
[[package]] [[package]]
@@ -1110,7 +1110,7 @@ dependencies = [
"target-lexicon", "target-lexicon",
"wasm-common", "wasm-common",
"wasmer-compiler", "wasmer-compiler",
"wasmer-runtime", "wasmer-vm",
] ]
[[package]] [[package]]
@@ -1127,7 +1127,7 @@ dependencies = [
"smallvec", "smallvec",
"wasm-common", "wasm-common",
"wasmer-compiler", "wasmer-compiler",
"wasmer-runtime", "wasmer-vm",
] ]
[[package]] [[package]]
@@ -1138,7 +1138,6 @@ dependencies = [
"bincode", "bincode",
"lazy_static", "lazy_static",
"more-asserts", "more-asserts",
"region",
"rustc-demangle", "rustc-demangle",
"serde", "serde",
"serde_bytes", "serde_bytes",
@@ -1146,7 +1145,7 @@ dependencies = [
"thiserror", "thiserror",
"wasm-common", "wasm-common",
"wasmer-compiler", "wasmer-compiler",
"wasmer-runtime", "wasmer-vm",
"winapi", "winapi",
] ]
@@ -1162,7 +1161,7 @@ dependencies = [
"wasm-common", "wasm-common",
"wasmer-compiler", "wasmer-compiler",
"wasmer-engine", "wasmer-engine",
"wasmer-runtime", "wasmer-vm",
"winapi", "winapi",
] ]
@@ -1182,7 +1181,7 @@ dependencies = [
"wasmer-compiler", "wasmer-compiler",
"wasmer-engine", "wasmer-engine",
"wasmer-object", "wasmer-object",
"wasmer-runtime", "wasmer-vm",
] ]
[[package]] [[package]]
@@ -1196,7 +1195,21 @@ dependencies = [
] ]
[[package]] [[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" version = "1.0.0-alpha.1"
dependencies = [ dependencies = [
"backtrace", "backtrace",
@@ -1213,20 +1226,6 @@ dependencies = [
"winapi", "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]] [[package]]
name = "wasmparser" name = "wasmparser"
version = "0.57.0" version = "0.57.0"

View File

@@ -15,7 +15,7 @@ wasmer = { path = "../../api", version = "1.0.0-alpha.1" }
wasmer-cache = { path = "../../cache", 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-compiler = { path = "../../compiler", version = "1.0.0-alpha.1", features = ["translator"] }
wasmer-engine = { path = "../../engine", version = "1.0.0-alpha.1" } 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" lazy_static = "1.4"
[build-dependencies] [build-dependencies]

View File

@@ -1,4 +1,4 @@
pub use crate::new::{ pub use crate::new::{
wasmer::{Exportable, Extern as Export}, wasmer::{Exportable, Extern as Export},
wasmer_runtime::Export as RuntimeExport, wasmer_vm::Export as RuntimeExport,
}; };

View File

@@ -87,7 +87,7 @@ impl From<&new::wasmer::Global> for Global {
} }
impl<'a> new::wasmer::Exportable<'a> 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() self.new_global.to_export()
} }

View File

@@ -30,11 +30,11 @@ impl Namespace {
} }
impl LikeNamespace for Namespace { impl LikeNamespace for Namespace {
fn get_namespace_export(&self, name: &str) -> Option<new::wasmer_runtime::Export> { fn get_namespace_export(&self, name: &str) -> Option<new::wasmer_vm::Export> {
self.exports.new_exports.get_namespace_export(name) 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() self.exports.new_exports.get_namespace_exports()
} }
} }

View File

@@ -222,11 +222,11 @@ impl Instance {
} }
impl LikeNamespace for Instance { impl LikeNamespace for Instance {
fn get_namespace_export(&self, name: &str) -> Option<new::wasmer_runtime::Export> { fn get_namespace_export(&self, name: &str) -> Option<new::wasmer_vm::Export> {
self.exports.new_exports.get_namespace_export(name) 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() self.exports.new_exports.get_namespace_exports()
} }
} }
@@ -256,11 +256,11 @@ impl Exports {
} }
impl LikeNamespace for Exports { impl LikeNamespace for Exports {
fn get_namespace_export(&self, name: &str) -> Option<new::wasmer_runtime::Export> { fn get_namespace_export(&self, name: &str) -> Option<new::wasmer_vm::Export> {
self.new_exports.get_namespace_export(name) 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() self.new_exports.get_namespace_exports()
} }
} }

View File

@@ -45,7 +45,7 @@ pub(crate) mod new {
pub use wasmer_cache; pub use wasmer_cache;
pub use wasmer_compiler; pub use wasmer_compiler;
pub use wasmer_engine; pub use wasmer_engine;
pub use wasmer_runtime; pub use wasmer_vm;
} }
pub mod backend; pub mod backend;

View File

@@ -11,7 +11,7 @@ pub mod ptr {
pub use new::wasm_common::MemoryType as MemoryDescriptor; pub use new::wasm_common::MemoryType as MemoryDescriptor;
pub use new::wasmer::{Atomically, MemoryView}; 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. /// A Wasm linear memory.
/// ///
@@ -108,7 +108,7 @@ impl From<&new::wasmer::Memory> for Memory {
} }
impl<'a> new::wasmer::Exportable<'a> 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() self.new_memory.to_export()
} }

View File

@@ -8,7 +8,7 @@ use crate::{
types::{FuncSig, Value}, types::{FuncSig, Value},
vm, vm,
}; };
use new::wasmer_runtime::Export; use new::wasmer_vm::Export;
use std::{ use std::{
cell::RefCell, cell::RefCell,
collections::HashMap, collections::HashMap,
@@ -17,7 +17,7 @@ use std::{
}; };
pub use new::wasm_common::{DataInitializer, ExportIndex}; pub use new::wasm_common::{DataInitializer, ExportIndex};
pub use new::wasmer_runtime::{ pub use new::wasmer_vm::{
// //
MemoryStyle as MemoryType, MemoryStyle as MemoryType,
ModuleInfo, ModuleInfo,
@@ -145,7 +145,7 @@ impl Module {
// stored by // stored by
// `new::wasmer::Function::new_dynamic_env`. // `new::wasmer::Function::new_dynamic_env`.
let vmctx: Box< let vmctx: Box<
new::wasmer_runtime::VMDynamicFunctionContext< new::wasmer_vm::VMDynamicFunctionContext<
VMDynamicFunctionWithEnv<DynamicCtx>, VMDynamicFunctionWithEnv<DynamicCtx>,
>, >,
> = unsafe { Box::from_raw(function.vmctx as *mut _) }; > = unsafe { Box::from_raw(function.vmctx as *mut _) };

View File

@@ -70,7 +70,7 @@ impl From<&new::wasmer::Table> for Table {
} }
impl<'a> new::wasmer::Exportable<'a> 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() self.new_table.to_export()
} }

View File

@@ -198,7 +198,7 @@ where
Args: WasmTypeList, Args: WasmTypeList,
Rets: WasmTypeList, Rets: WasmTypeList,
{ {
fn to_export(&self) -> new::wasmer_runtime::Export { fn to_export(&self) -> new::wasmer_vm::Export {
self.new_function.to_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 { 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() self.new_function.to_export()
} }