Merge pull request #3683 from wasmerio/rename_crates

Renamed some crates and changed their version to 0.1.0

CHANGELOG.md

@@ -898,7 +898,7 @@ Special thanks to [@ethanfrey](https://github.com/ethanfrey), [@AdamSLevy](https
 - [#992](https://github.com/wasmerio/wasmer/pull/992) Updates WAPM version to 0.4.1, fix arguments issue introduced in #990
 - [#990](https://github.com/wasmerio/wasmer/pull/990) Default wasmer CLI to `run`.  Wasmer will now attempt to parse unrecognized command line options as if they were applied to the run command: `wasmer mywasm.wasm --dir=.` now works!
 - [#987](https://github.com/wasmerio/wasmer/pull/987) Fix `runtime-c-api` header files when compiled by gnuc.
-- [#957](https://github.com/wasmerio/wasmer/pull/957) Change the meaning of `wasmer_wasi::is_wasi_module` to detect any type of WASI module, add support for new wasi snapshot_preview1
+- [#957](https://github.com/wasmerio/wasmer/pull/957) Change the meaning of `wasmer_wasix::is_wasi_module` to detect any type of WASI module, add support for new wasi snapshot_preview1
 - [#934](https://github.com/wasmerio/wasmer/pull/934) Simplify float expressions in the LLVM backend.
 
 ## 0.10.2 - 2019-11-18

Cargo.toml

@@ -18,7 +18,7 @@ wasmer-compiler-cranelift = { version = "=3.2.0-alpha.1", path = "lib/compiler-c
 wasmer-compiler-singlepass = { version = "=3.2.0-alpha.1", path = "lib/compiler-singlepass", optional = true }
 wasmer-compiler-llvm = { version = "=3.2.0-alpha.1", path = "lib/compiler-llvm", optional = true }
 wasmer-emscripten = { version = "=3.2.0-alpha.1", path = "lib/emscripten", optional = true }
-wasmer-wasi = { version = "=3.2.0-alpha.1", path = "lib/wasi", optional = true }
+wasmer-wasix = { version = "0.1.0", path = "lib/wasi", optional = true }
 wasmer-wast = { version = "=3.2.0-alpha.1", path = "tests/lib/wast", optional = true }
 wasi-test-generator = { version = "=3.2.0-alpha.1", path = "tests/wasi-wast", optional = true }
 wasmer-cache = { version = "=3.2.0-alpha.1", path = "lib/cache", optional = true }
@@ -49,7 +49,6 @@ members = [
     "lib/wasi",
     "lib/wasi-types",
     "lib/wasi-experimental-io-devices",
-    "lib/wasi-local-networking",
     "lib/wasix/wasix-http-client",
     "lib/wasm-interface",
     "lib/c-api/tests/wasmer-c-api-test-runner",
@@ -106,7 +105,7 @@ engine = ["universal"]
 universal = []
 cache = ["wasmer-cache"]
 wast = ["wasmer-wast"]
-wasi = ["wasmer-wasi"]
+wasi = ["wasmer-wasix"]
 emscripten = ["wasmer-emscripten"]
 wat = ["wasmer/wat"]
 compiler = ["wasmer/compiler", "wasmer-compiler/translator"]

examples/wasi.rs

@@ -18,7 +18,7 @@ use std::io::Read;
 
 use wasmer::{Module, Store};
 use wasmer_compiler_cranelift::Cranelift;
-use wasmer_wasi::{Pipe, WasiEnv};
+use wasmer_wasix::{Pipe, WasiEnv};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let wasm_path = concat!(

examples/wasi_manual_setup.rs

@@ -17,7 +17,7 @@
 
 use wasmer::{Instance, Module, Store};
 use wasmer_compiler_cranelift::Cranelift;
-use wasmer_wasi::WasiEnv;
+use wasmer_wasix::WasiEnv;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let wasm_path = concat!(

examples/wasi_pipes.rs

@@ -14,7 +14,7 @@
 use std::io::{Read, Write};
 use wasmer::{Module, Store};
 use wasmer_compiler_cranelift::Cranelift;
-use wasmer_wasi::{Pipe, WasiEnv};
+use wasmer_wasix::{Pipe, WasiEnv};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let wasm_path = concat!(

lib/c-api/Cargo.toml

@@ -29,9 +29,9 @@ wasmer-compiler-llvm = { version = "=3.2.0-alpha.1", path = "../compiler-llvm",
 wasmer-emscripten = { version = "=3.2.0-alpha.1", path = "../emscripten", optional = true }
 wasmer-compiler = { version = "=3.2.0-alpha.1", path = "../compiler" }
 wasmer-middlewares = { version = "=3.2.0-alpha.1", path = "../middlewares", optional = true }
-wasmer-wasi = { version = "=3.2.0-alpha.1", path = "../wasi", features = ["host-fs", "host-vnet"], optional = true }
+wasmer-wasix = { version = "0.1.0", path = "../wasi", features = ["host-fs", "host-vnet"], optional = true }
 wasmer-types = { version = "=3.2.0-alpha.1", path = "../types" }
-wasmer-vfs = { version = "=3.2.0-alpha.1", path = "../vfs", optional = true, default-features = false, features = ["static-fs"] }
+virtual-fs = { version = "0.1.0", path = "../vfs", optional = true, default-features = false, features = ["static-fs"] }
 webc = { version = "5.0.0-rc.5", optional = true }
 enumset = "1.0.2"
 cfg-if = "1.0"
@@ -59,7 +59,7 @@ default = [
     "middlewares",
 ]
 wat = ["wasmer-api/wat"]
-wasi = ["wasmer-wasi"]
+wasi = ["wasmer-wasix"]
 middlewares = [
     "compiler",
     "wasmer-middlewares",
@@ -92,7 +92,7 @@ wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
 wasmer-artifact-create = ["wasmer-compiler/wasmer-artifact-create"]
 static-artifact-load = ["wasmer-compiler/static-artifact-load"]
 static-artifact-create = ["wasmer-compiler/static-artifact-create"]
-webc_runner = ["wasmer-wasi/webc_runner", "wasmer-vfs", "webc"]
+webc_runner = ["wasmer-wasix/webc_runner", "virtual-fs", "webc"]
 # Deprecated features.
 jit = ["compiler"]
 

lib/c-api/src/wasm_c_api/wasi/mod.rs

@@ -18,8 +18,8 @@ use std::os::raw::c_char;
 use std::slice;
 #[cfg(feature = "webc_runner")]
 use wasmer_api::{AsStoreMut, Imports, Module};
-use wasmer_wasi::{
-    default_fs_backing, get_wasi_version, wasmer_vfs::AsyncReadExt, Pipe, VirtualTaskManager,
+use wasmer_wasix::{
+    default_fs_backing, get_wasi_version, virtual_fs::AsyncReadExt, Pipe, VirtualTaskManager,
     WasiEnv, WasiEnvBuilder, WasiFile, WasiFunctionEnv, WasiVersion,
 };
 
@@ -248,7 +248,7 @@ fn prepare_webc_env(
     len: usize,
     package_name: &str,
 ) -> Option<(WasiFunctionEnv, Imports)> {
-    use wasmer_vfs::static_fs::StaticFileSystem;
+    use virtual_fs::static_fs::StaticFileSystem;
     use webc::v1::{FsEntryType, WebC};
 
     let slice = unsafe { std::slice::from_raw_parts(bytes, len) };