chore: Rename wasi dir to wasiX

Synchronise the crate name with the directory structure. Also had to move the lib/wasix/wasix-http-client dir one layer up. Closes #3785
wasmerio · Jun 6, 2023 · 09b8303 · 09b8303
1 parent fe1b440
commit 09b8303
Show file tree

Hide file tree

Showing 246 changed files with 31 additions and 31 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ wasmer-compiler-cranelift = { version = "=4.0.0-beta.1", path = "lib/compiler-cr
 wasmer-compiler-singlepass = { version = "=4.0.0-beta.1", path = "lib/compiler-singlepass", optional = true }
 wasmer-compiler-llvm = { version = "=4.0.0-beta.1", path = "lib/compiler-llvm", optional = true }
 wasmer-emscripten = { version = "=4.0.0-beta.1", path = "lib/emscripten", optional = true }
-wasmer-wasix = { version = "0.6.0", path = "lib/wasi", optional = true }
+wasmer-wasix = { version = "0.6.0", path = "lib/wasix", optional = true }
 wasmer-wast = { version = "=4.0.0-beta.1", path = "tests/lib/wast", optional = true }
 wasi-test-generator = { version = "=4.0.0-beta.1", path = "tests/wasi-wast", optional = true }
 wasmer-cache = { version = "=4.0.0-beta.1", path = "lib/cache", optional = true }
@@ -55,8 +55,8 @@ members = [
     "lib/wai-bindgen-wasmer",
     "lib/wasi-experimental-io-devices",
     "lib/wasi-types",
-    "lib/wasi",
-    "lib/wasix/wasix-http-client",
+    "lib/wasix",
+    "lib/wasix-http-client",
     "lib/wasm-interface",
     "tests/integration/cli",
     "tests/integration/ios",

diff --git a/Makefile b/Makefile
@@ -568,7 +568,7 @@ test-js-api:
 	cd lib/api && wasm-pack test --node -- --no-default-features --features js-default,wat
 
 test-js-wasi:
-	cd lib/wasi && wasm-pack test --node -- --no-default-features --features test-js,wasmer/js,wasmer/std
+	cd lib/wasix && wasm-pack test --node -- --no-default-features --features test-js,wasmer/js,wasmer/std
 
 #####
 #

diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
@@ -32,7 +32,7 @@ wasmer-compiler-singlepass = { version = "=4.0.0-beta.1", path = "../compiler-si
 wasmer-emscripten = { version = "=4.0.0-beta.1", path = "../emscripten", optional = true }
 wasmer-middlewares = { version = "=4.0.0-beta.1", path = "../middlewares", optional = true }
 wasmer-types = { version = "=4.0.0-beta.1", path = "../types" }
-wasmer-wasix = { version = "0.6.0", path = "../wasi", features = ["host-fs", "host-vnet"], optional = true }
+wasmer-wasix = { version = "0.6.0", path = "../wasix", features = ["host-fs", "host-vnet"], optional = true }
 webc = { version = "5.0", optional = true }
 virtual-fs = { version = "0.4.0", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] }
 enumset = "1.0.2"

diff --git a/lib/cache/src/filesystem.rs b/lib/cache/src/filesystem.rs
@@ -140,7 +140,7 @@ mod tests {
 
         let engine = wasmer::Engine::default();
 
-        let bytes = include_bytes!("../../wasi/tests/envvar.wasm");
+        let bytes = include_bytes!("../../wasix/tests/envvar.wasm");
 
         let module = Module::from_binary(&engine, bytes).unwrap();
         let key = Hash::generate(bytes);

diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -34,7 +34,7 @@ wasmer-compiler-singlepass = { version = "=4.0.0-beta.1", path = "../compiler-si
 wasmer-compiler-llvm = { version = "=4.0.0-beta.1", path = "../compiler-llvm", optional = true }
 wasmer-emscripten = { version = "=4.0.0-beta.1", path = "../emscripten" }
 wasmer-vm = { version = "=4.0.0-beta.1", path = "../vm", optional = true }
-wasmer-wasix = { version = "0.6.0", path = "../wasi", features = ["logging", "webc_runner", "webc_runner_rt_wcgi", "webc_runner_rt_wasi", "webc_runner_rt_emscripten", "host-fs"] }
+wasmer-wasix = { version = "0.6.0", path = "../wasix", features = ["logging", "webc_runner", "webc_runner_rt_wcgi", "webc_runner_rt_wasi", "webc_runner_rt_emscripten", "host-fs"] }
 wasmer-wasix-experimental-io-devices = { version = "0.6.0", path = "../wasi-experimental-io-devices", optional = true, features = ["link_external_libs"] }
 wasmer-wast = { version = "=4.0.0-beta.1", path = "../../tests/lib/wast", optional = true }
 wasmer-cache = { version = "=4.0.0-beta.1", path = "../cache", features = ["blake3-pure"] }

diff --git a/lib/sys-utils/Cargo.toml b/lib/sys-utils/Cargo.toml
@@ -22,7 +22,7 @@ tracing = "0.1.37"
 libc = { version = "^0.2", default-features = false }
 
 [dev-dependencies]
-wasmer-wasix = { path = "../wasi", version = "0.6.0" }
+wasmer-wasix = { path = "../wasix", version = "0.6.0" }
 wasmer = { path = "../api", version = "=4.0.0-beta.1", default-features = false, features = ["sys", "compiler", "cranelift"] }
 tracing-subscriber = { version = "0.3.16", features = ["fmt"] }
 tracing = "0.1.37"
diff --git a/lib/wasi-experimental-io-devices/Cargo.toml b/lib/wasi-experimental-io-devices/Cargo.toml
@@ -17,7 +17,7 @@ maintenance = { status = "experimental" }
 
 [dependencies]
 wasmer = { version = "4.0.0-beta.1", path = "../api", default-features=false }
-wasmer-wasix = { version = "0.6.0", path = "../wasi", default-features=false }
+wasmer-wasix = { version = "0.6.0", path = "../wasix", default-features=false }
 wasmer-wasix-types = { path = "../wasi-types", version = "0.6.0" }
 tracing = "0.1"
 minifb = { version = "0.24.0", optional = true }

diff --git a/lib/wasi-web/Cargo.toml b/lib/wasi-web/Cargo.toml
@@ -17,7 +17,7 @@ rust-version = "1.67"
 
 [dependencies]
 wasmer = { path = "../api", default_features = false, features = [ "js-default" ] }
-wasmer-wasix = { path = "../wasi", version = "0.5.0",  default-features = false, features = [ "js-default" ] }
+wasmer-wasix = { path = "../wasix", version = "0.5.0",  default-features = false, features = [ "js-default" ] }
 #wasm-bindgen = { version = "0.2", features = [ "nightly", "serde-serialize" ] }
 wasm-bindgen = { version = "0.2", features = [ "serde-serialize" ] }
 wasm-bindgen-futures = "0.4"

diff --git a/lib/wasix/wasix-http-client/Cargo.toml → lib/wasix-http-client/Cargo.toml b/lib/wasix/wasix-http-client/Cargo.toml → lib/wasix-http-client/Cargo.toml
diff --git a/...wasix-http-client/examples/http_client.rs → ...wasix-http-client/examples/http_client.rs b/...wasix-http-client/examples/http_client.rs → ...wasix-http-client/examples/http_client.rs
diff --git a/lib/wasix/wasix-http-client/src/lib.rs → lib/wasix-http-client/src/lib.rs b/lib/wasix/wasix-http-client/src/lib.rs → lib/wasix-http-client/src/lib.rs
diff --git a/...x-http-client/src/wasix_http_client_v1.rs → ...x-http-client/src/wasix_http_client_v1.rs b/...x-http-client/src/wasix_http_client_v1.rs → ...x-http-client/src/wasix_http_client_v1.rs
diff --git a/lib/wasi/Cargo.toml → lib/wasix/Cargo.toml b/lib/wasi/Cargo.toml → lib/wasix/Cargo.toml
diff --git a/lib/wasi/README.md → lib/wasix/README.md b/lib/wasi/README.md → lib/wasix/README.md
diff --git a/lib/wasi/src/bin_factory/binary_package.rs → lib/wasix/src/bin_factory/binary_package.rs b/lib/wasi/src/bin_factory/binary_package.rs → lib/wasix/src/bin_factory/binary_package.rs
diff --git a/lib/wasi/src/bin_factory/exec.rs → lib/wasix/src/bin_factory/exec.rs b/lib/wasi/src/bin_factory/exec.rs → lib/wasix/src/bin_factory/exec.rs
diff --git a/lib/wasi/src/bin_factory/mod.rs → lib/wasix/src/bin_factory/mod.rs b/lib/wasi/src/bin_factory/mod.rs → lib/wasix/src/bin_factory/mod.rs
diff --git a/lib/wasi/src/bindings/mod.rs → lib/wasix/src/bindings/mod.rs b/lib/wasi/src/bindings/mod.rs → lib/wasix/src/bindings/mod.rs
diff --git a/...wasi/src/bindings/wasix_http_client_v1.rs → ...asix/src/bindings/wasix_http_client_v1.rs b/...wasi/src/bindings/wasix_http_client_v1.rs → ...asix/src/bindings/wasix_http_client_v1.rs
diff --git a/lib/wasi/src/capabilities.rs → lib/wasix/src/capabilities.rs b/lib/wasi/src/capabilities.rs → lib/wasix/src/capabilities.rs
diff --git a/lib/wasi/src/fs/fd.rs → lib/wasix/src/fs/fd.rs b/lib/wasi/src/fs/fd.rs → lib/wasix/src/fs/fd.rs
diff --git a/lib/wasi/src/fs/inode_guard.rs → lib/wasix/src/fs/inode_guard.rs b/lib/wasi/src/fs/inode_guard.rs → lib/wasix/src/fs/inode_guard.rs
diff --git a/lib/wasi/src/fs/mod.rs → lib/wasix/src/fs/mod.rs b/lib/wasi/src/fs/mod.rs → lib/wasix/src/fs/mod.rs
diff --git a/lib/wasi/src/fs/notification.rs → lib/wasix/src/fs/notification.rs b/lib/wasi/src/fs/notification.rs → lib/wasix/src/fs/notification.rs
diff --git a/lib/wasi/src/http/client.rs → lib/wasix/src/http/client.rs b/lib/wasi/src/http/client.rs → lib/wasix/src/http/client.rs
diff --git a/lib/wasi/src/http/client_impl.rs → lib/wasix/src/http/client_impl.rs b/lib/wasi/src/http/client_impl.rs → lib/wasix/src/http/client_impl.rs
diff --git a/lib/wasi/src/http/mod.rs → lib/wasix/src/http/mod.rs b/lib/wasi/src/http/mod.rs → lib/wasix/src/http/mod.rs
diff --git a/lib/wasi/src/http/reqwest.rs → lib/wasix/src/http/reqwest.rs b/lib/wasi/src/http/reqwest.rs → lib/wasix/src/http/reqwest.rs
diff --git a/lib/wasi/src/lib.rs → lib/wasix/src/lib.rs b/lib/wasi/src/lib.rs → lib/wasix/src/lib.rs
diff --git a/lib/wasi/src/macros.rs → lib/wasix/src/macros.rs b/lib/wasi/src/macros.rs → lib/wasix/src/macros.rs
diff --git a/lib/wasi/src/net/mod.rs → lib/wasix/src/net/mod.rs b/lib/wasi/src/net/mod.rs → lib/wasix/src/net/mod.rs
diff --git a/lib/wasi/src/net/socket.rs → lib/wasix/src/net/socket.rs b/lib/wasi/src/net/socket.rs → lib/wasix/src/net/socket.rs
diff --git a/...asi/src/os/command/builtins/cmd_wasmer.rs → ...six/src/os/command/builtins/cmd_wasmer.rs b/...asi/src/os/command/builtins/cmd_wasmer.rs → ...six/src/os/command/builtins/cmd_wasmer.rs
diff --git a/lib/wasi/src/os/command/builtins/mod.rs → lib/wasix/src/os/command/builtins/mod.rs b/lib/wasi/src/os/command/builtins/mod.rs → lib/wasix/src/os/command/builtins/mod.rs
diff --git a/lib/wasi/src/os/command/mod.rs → lib/wasix/src/os/command/mod.rs b/lib/wasi/src/os/command/mod.rs → lib/wasix/src/os/command/mod.rs
diff --git a/lib/wasi/src/os/common.rs → lib/wasix/src/os/common.rs b/lib/wasi/src/os/common.rs → lib/wasix/src/os/common.rs
diff --git a/lib/wasi/src/os/console/cconst.rs → lib/wasix/src/os/console/cconst.rs b/lib/wasi/src/os/console/cconst.rs → lib/wasix/src/os/console/cconst.rs
diff --git a/lib/wasi/src/os/console/mod.rs → lib/wasix/src/os/console/mod.rs b/lib/wasi/src/os/console/mod.rs → lib/wasix/src/os/console/mod.rs
diff --git a/lib/wasi/src/os/console/txt/about.md → lib/wasix/src/os/console/txt/about.md b/lib/wasi/src/os/console/txt/about.md → lib/wasix/src/os/console/txt/about.md
diff --git a/lib/wasi/src/os/console/txt/about_wasmer.md → lib/wasix/src/os/console/txt/about_wasmer.md b/lib/wasi/src/os/console/txt/about_wasmer.md → lib/wasix/src/os/console/txt/about_wasmer.md
diff --git a/lib/wasi/src/os/console/txt/bad_worker.md → lib/wasix/src/os/console/txt/bad_worker.md b/lib/wasi/src/os/console/txt/bad_worker.md → lib/wasix/src/os/console/txt/bad_worker.md
diff --git a/lib/wasi/src/os/console/txt/help.md → lib/wasix/src/os/console/txt/help.md b/lib/wasi/src/os/console/txt/help.md → lib/wasix/src/os/console/txt/help.md
diff --git a/...wasi/src/os/console/txt/welcome_large.txt → ...asix/src/os/console/txt/welcome_large.txt b/...wasi/src/os/console/txt/welcome_large.txt → ...asix/src/os/console/txt/welcome_large.txt
diff --git a/...asi/src/os/console/txt/welcome_medium.txt → ...six/src/os/console/txt/welcome_medium.txt b/...asi/src/os/console/txt/welcome_medium.txt → ...six/src/os/console/txt/welcome_medium.txt
diff --git a/...wasi/src/os/console/txt/welcome_small.txt → ...asix/src/os/console/txt/welcome_small.txt b/...wasi/src/os/console/txt/welcome_small.txt → ...asix/src/os/console/txt/welcome_small.txt
diff --git a/lib/wasi/src/os/mod.rs → lib/wasix/src/os/mod.rs b/lib/wasi/src/os/mod.rs → lib/wasix/src/os/mod.rs
diff --git a/lib/wasi/src/os/posix_err.rs → lib/wasix/src/os/posix_err.rs b/lib/wasi/src/os/posix_err.rs → lib/wasix/src/os/posix_err.rs
diff --git a/lib/wasi/src/os/task/control_plane.rs → lib/wasix/src/os/task/control_plane.rs b/lib/wasi/src/os/task/control_plane.rs → lib/wasix/src/os/task/control_plane.rs
diff --git a/lib/wasi/src/os/task/mod.rs → lib/wasix/src/os/task/mod.rs b/lib/wasi/src/os/task/mod.rs → lib/wasix/src/os/task/mod.rs
diff --git a/lib/wasi/src/os/task/process.rs → lib/wasix/src/os/task/process.rs b/lib/wasi/src/os/task/process.rs → lib/wasix/src/os/task/process.rs
diff --git a/lib/wasi/src/os/task/signal.rs → lib/wasix/src/os/task/signal.rs b/lib/wasi/src/os/task/signal.rs → lib/wasix/src/os/task/signal.rs
diff --git a/lib/wasi/src/os/task/task_join_handle.rs → lib/wasix/src/os/task/task_join_handle.rs b/lib/wasi/src/os/task/task_join_handle.rs → lib/wasix/src/os/task/task_join_handle.rs
diff --git a/lib/wasi/src/os/task/thread.rs → lib/wasix/src/os/task/thread.rs b/lib/wasi/src/os/task/thread.rs → lib/wasix/src/os/task/thread.rs
diff --git a/lib/wasi/src/os/tty/mod.rs → lib/wasix/src/os/tty/mod.rs b/lib/wasi/src/os/tty/mod.rs → lib/wasix/src/os/tty/mod.rs
diff --git a/lib/wasi/src/os/tty/tty_sys.rs → lib/wasix/src/os/tty/tty_sys.rs b/lib/wasi/src/os/tty/tty_sys.rs → lib/wasix/src/os/tty/tty_sys.rs
diff --git a/lib/wasi/src/rewind.rs → lib/wasix/src/rewind.rs b/lib/wasi/src/rewind.rs → lib/wasix/src/rewind.rs
diff --git a/lib/wasi/src/runners/emscripten.rs → lib/wasix/src/runners/emscripten.rs b/lib/wasi/src/runners/emscripten.rs → lib/wasix/src/runners/emscripten.rs
diff --git a/lib/wasi/src/runners/mod.rs → lib/wasix/src/runners/mod.rs b/lib/wasi/src/runners/mod.rs → lib/wasix/src/runners/mod.rs
diff --git a/lib/wasi/src/runners/runner.rs → lib/wasix/src/runners/runner.rs b/lib/wasi/src/runners/runner.rs → lib/wasix/src/runners/runner.rs
diff --git a/lib/wasi/src/runners/wasi.rs → lib/wasix/src/runners/wasi.rs b/lib/wasi/src/runners/wasi.rs → lib/wasix/src/runners/wasi.rs
diff --git a/lib/wasi/src/runners/wasi_common.rs → lib/wasix/src/runners/wasi_common.rs b/lib/wasi/src/runners/wasi_common.rs → lib/wasix/src/runners/wasi_common.rs
diff --git a/lib/wasi/src/runners/wcgi/handler.rs → lib/wasix/src/runners/wcgi/handler.rs b/lib/wasi/src/runners/wcgi/handler.rs → lib/wasix/src/runners/wcgi/handler.rs
diff --git a/lib/wasi/src/runners/wcgi/mod.rs → lib/wasix/src/runners/wcgi/mod.rs b/lib/wasi/src/runners/wcgi/mod.rs → lib/wasix/src/runners/wcgi/mod.rs
diff --git a/lib/wasi/src/runners/wcgi/runner.rs → lib/wasix/src/runners/wcgi/runner.rs b/lib/wasi/src/runners/wcgi/runner.rs → lib/wasix/src/runners/wcgi/runner.rs
diff --git a/lib/wasi/src/runtime/mod.rs → lib/wasix/src/runtime/mod.rs b/lib/wasi/src/runtime/mod.rs → lib/wasix/src/runtime/mod.rs
diff --git a/...wasi/src/runtime/module_cache/fallback.rs → ...asix/src/runtime/module_cache/fallback.rs b/...wasi/src/runtime/module_cache/fallback.rs → ...asix/src/runtime/module_cache/fallback.rs
diff --git a/...si/src/runtime/module_cache/filesystem.rs → ...ix/src/runtime/module_cache/filesystem.rs b/...si/src/runtime/module_cache/filesystem.rs → ...ix/src/runtime/module_cache/filesystem.rs
diff --git a/lib/wasi/src/runtime/module_cache/mod.rs → lib/wasix/src/runtime/module_cache/mod.rs b/lib/wasi/src/runtime/module_cache/mod.rs → lib/wasix/src/runtime/module_cache/mod.rs
diff --git a/lib/wasi/src/runtime/module_cache/shared.rs → lib/wasix/src/runtime/module_cache/shared.rs b/lib/wasi/src/runtime/module_cache/shared.rs → lib/wasix/src/runtime/module_cache/shared.rs
diff --git a/.../src/runtime/module_cache/thread_local.rs → .../src/runtime/module_cache/thread_local.rs b/.../src/runtime/module_cache/thread_local.rs → .../src/runtime/module_cache/thread_local.rs
diff --git a/lib/wasi/src/runtime/module_cache/types.rs → lib/wasix/src/runtime/module_cache/types.rs b/lib/wasi/src/runtime/module_cache/types.rs → lib/wasix/src/runtime/module_cache/types.rs
diff --git a/.../runtime/package_loader/builtin_loader.rs → .../runtime/package_loader/builtin_loader.rs b/.../runtime/package_loader/builtin_loader.rs → .../runtime/package_loader/builtin_loader.rs
diff --git a/...ntime/package_loader/load_package_tree.rs → ...ntime/package_loader/load_package_tree.rs b/...ntime/package_loader/load_package_tree.rs → ...ntime/package_loader/load_package_tree.rs
diff --git a/lib/wasi/src/runtime/package_loader/mod.rs → lib/wasix/src/runtime/package_loader/mod.rs b/lib/wasi/src/runtime/package_loader/mod.rs → lib/wasix/src/runtime/package_loader/mod.rs
diff --git a/lib/wasi/src/runtime/package_loader/types.rs → ...wasix/src/runtime/package_loader/types.rs b/lib/wasi/src/runtime/package_loader/types.rs → ...wasix/src/runtime/package_loader/types.rs
diff --git a/...src/runtime/resolver/filesystem_source.rs → ...src/runtime/resolver/filesystem_source.rs b/...src/runtime/resolver/filesystem_source.rs → ...src/runtime/resolver/filesystem_source.rs
diff --git a/.../src/runtime/resolver/in_memory_source.rs → .../src/runtime/resolver/in_memory_source.rs b/.../src/runtime/resolver/in_memory_source.rs → .../src/runtime/resolver/in_memory_source.rs
diff --git a/lib/wasi/src/runtime/resolver/inputs.rs → lib/wasix/src/runtime/resolver/inputs.rs b/lib/wasi/src/runtime/resolver/inputs.rs → lib/wasix/src/runtime/resolver/inputs.rs
diff --git a/lib/wasi/src/runtime/resolver/mod.rs → lib/wasix/src/runtime/resolver/mod.rs b/lib/wasi/src/runtime/resolver/mod.rs → lib/wasix/src/runtime/resolver/mod.rs
diff --git a/...runtime/resolver/multi_source_registry.rs → ...runtime/resolver/multi_source_registry.rs b/...runtime/resolver/multi_source_registry.rs → ...runtime/resolver/multi_source_registry.rs
diff --git a/lib/wasi/src/runtime/resolver/outputs.rs → lib/wasix/src/runtime/resolver/outputs.rs b/lib/wasi/src/runtime/resolver/outputs.rs → lib/wasix/src/runtime/resolver/outputs.rs
diff --git a/lib/wasi/src/runtime/resolver/resolve.rs → lib/wasix/src/runtime/resolver/resolve.rs b/lib/wasi/src/runtime/resolver/resolve.rs → lib/wasix/src/runtime/resolver/resolve.rs
diff --git a/lib/wasi/src/runtime/resolver/source.rs → lib/wasix/src/runtime/resolver/source.rs b/lib/wasi/src/runtime/resolver/source.rs → lib/wasix/src/runtime/resolver/source.rs
diff --git a/lib/wasi/src/runtime/resolver/utils.rs → lib/wasix/src/runtime/resolver/utils.rs b/lib/wasi/src/runtime/resolver/utils.rs → lib/wasix/src/runtime/resolver/utils.rs
diff --git a/lib/wasi/src/runtime/resolver/wapm_source.rs → ...wasix/src/runtime/resolver/wapm_source.rs b/lib/wasi/src/runtime/resolver/wapm_source.rs → ...wasix/src/runtime/resolver/wapm_source.rs
diff --git a/lib/wasi/src/runtime/resolver/web_source.rs → lib/wasix/src/runtime/resolver/web_source.rs b/lib/wasi/src/runtime/resolver/web_source.rs → lib/wasix/src/runtime/resolver/web_source.rs
diff --git a/lib/wasi/src/runtime/task_manager/mod.rs → lib/wasix/src/runtime/task_manager/mod.rs b/lib/wasi/src/runtime/task_manager/mod.rs → lib/wasix/src/runtime/task_manager/mod.rs
diff --git a/lib/wasi/src/runtime/task_manager/thread.rs → lib/wasix/src/runtime/task_manager/thread.rs b/lib/wasi/src/runtime/task_manager/thread.rs → lib/wasix/src/runtime/task_manager/thread.rs
diff --git a/lib/wasi/src/runtime/task_manager/tokio.rs → lib/wasix/src/runtime/task_manager/tokio.rs b/lib/wasi/src/runtime/task_manager/tokio.rs → lib/wasix/src/runtime/task_manager/tokio.rs
diff --git a/lib/wasi/src/state/builder.rs → lib/wasix/src/state/builder.rs b/lib/wasi/src/state/builder.rs → lib/wasix/src/state/builder.rs
diff --git a/lib/wasi/src/state/env.rs → lib/wasix/src/state/env.rs b/lib/wasi/src/state/env.rs → lib/wasix/src/state/env.rs
diff --git a/lib/wasi/src/state/func_env.rs → lib/wasix/src/state/func_env.rs b/lib/wasi/src/state/func_env.rs → lib/wasix/src/state/func_env.rs
diff --git a/lib/wasi/src/state/handles/global.rs → lib/wasix/src/state/handles/global.rs b/lib/wasi/src/state/handles/global.rs → lib/wasix/src/state/handles/global.rs
diff --git a/lib/wasi/src/state/handles/mod.rs → lib/wasix/src/state/handles/mod.rs b/lib/wasi/src/state/handles/mod.rs → lib/wasix/src/state/handles/mod.rs
diff --git a/lib/wasi/src/state/handles/thread_local.rs → lib/wasix/src/state/handles/thread_local.rs b/lib/wasi/src/state/handles/thread_local.rs → lib/wasix/src/state/handles/thread_local.rs
diff --git a/lib/wasi/src/state/mod.rs → lib/wasix/src/state/mod.rs b/lib/wasi/src/state/mod.rs → lib/wasix/src/state/mod.rs
diff --git a/lib/wasi/src/state/pipe.rs → lib/wasix/src/state/pipe.rs b/lib/wasi/src/state/pipe.rs → lib/wasix/src/state/pipe.rs
diff --git a/lib/wasi/src/state/types.rs → lib/wasix/src/state/types.rs b/lib/wasi/src/state/types.rs → lib/wasix/src/state/types.rs
diff --git a/lib/wasi/src/syscalls/legacy/mod.rs → lib/wasix/src/syscalls/legacy/mod.rs b/lib/wasi/src/syscalls/legacy/mod.rs → lib/wasix/src/syscalls/legacy/mod.rs
diff --git a/lib/wasi/src/syscalls/legacy/snapshot0.rs → lib/wasix/src/syscalls/legacy/snapshot0.rs b/lib/wasi/src/syscalls/legacy/snapshot0.rs → lib/wasix/src/syscalls/legacy/snapshot0.rs
diff --git a/lib/wasi/src/syscalls/mod.rs → lib/wasix/src/syscalls/mod.rs b/lib/wasi/src/syscalls/mod.rs → lib/wasix/src/syscalls/mod.rs
diff --git a/lib/wasi/src/syscalls/unix/mod.rs → lib/wasix/src/syscalls/unix/mod.rs b/lib/wasi/src/syscalls/unix/mod.rs → lib/wasix/src/syscalls/unix/mod.rs
diff --git a/lib/wasi/src/syscalls/wasi/args_get.rs → lib/wasix/src/syscalls/wasi/args_get.rs b/lib/wasi/src/syscalls/wasi/args_get.rs → lib/wasix/src/syscalls/wasi/args_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/args_sizes_get.rs → ...wasix/src/syscalls/wasi/args_sizes_get.rs b/lib/wasi/src/syscalls/wasi/args_sizes_get.rs → ...wasix/src/syscalls/wasi/args_sizes_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/clock_res_get.rs → lib/wasix/src/syscalls/wasi/clock_res_get.rs b/lib/wasi/src/syscalls/wasi/clock_res_get.rs → lib/wasix/src/syscalls/wasi/clock_res_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/clock_time_get.rs → ...wasix/src/syscalls/wasi/clock_time_get.rs b/lib/wasi/src/syscalls/wasi/clock_time_get.rs → ...wasix/src/syscalls/wasi/clock_time_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/clock_time_set.rs → ...wasix/src/syscalls/wasi/clock_time_set.rs b/lib/wasi/src/syscalls/wasi/clock_time_set.rs → ...wasix/src/syscalls/wasi/clock_time_set.rs
diff --git a/lib/wasi/src/syscalls/wasi/environ_get.rs → lib/wasix/src/syscalls/wasi/environ_get.rs b/lib/wasi/src/syscalls/wasi/environ_get.rs → lib/wasix/src/syscalls/wasi/environ_get.rs
diff --git a/...si/src/syscalls/wasi/environ_sizes_get.rs → ...ix/src/syscalls/wasi/environ_sizes_get.rs b/...si/src/syscalls/wasi/environ_sizes_get.rs → ...ix/src/syscalls/wasi/environ_sizes_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_advise.rs → lib/wasix/src/syscalls/wasi/fd_advise.rs b/lib/wasi/src/syscalls/wasi/fd_advise.rs → lib/wasix/src/syscalls/wasi/fd_advise.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_allocate.rs → lib/wasix/src/syscalls/wasi/fd_allocate.rs b/lib/wasi/src/syscalls/wasi/fd_allocate.rs → lib/wasix/src/syscalls/wasi/fd_allocate.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_close.rs → lib/wasix/src/syscalls/wasi/fd_close.rs b/lib/wasi/src/syscalls/wasi/fd_close.rs → lib/wasix/src/syscalls/wasi/fd_close.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_datasync.rs → lib/wasix/src/syscalls/wasi/fd_datasync.rs b/lib/wasi/src/syscalls/wasi/fd_datasync.rs → lib/wasix/src/syscalls/wasi/fd_datasync.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_dup.rs → lib/wasix/src/syscalls/wasi/fd_dup.rs b/lib/wasi/src/syscalls/wasi/fd_dup.rs → lib/wasix/src/syscalls/wasi/fd_dup.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_event.rs → lib/wasix/src/syscalls/wasi/fd_event.rs b/lib/wasi/src/syscalls/wasi/fd_event.rs → lib/wasix/src/syscalls/wasi/fd_event.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_fdstat_get.rs → lib/wasix/src/syscalls/wasi/fd_fdstat_get.rs b/lib/wasi/src/syscalls/wasi/fd_fdstat_get.rs → lib/wasix/src/syscalls/wasi/fd_fdstat_get.rs
diff --git a/.../src/syscalls/wasi/fd_fdstat_set_flags.rs → .../src/syscalls/wasi/fd_fdstat_set_flags.rs b/.../src/syscalls/wasi/fd_fdstat_set_flags.rs → .../src/syscalls/wasi/fd_fdstat_set_flags.rs
diff --git a/...src/syscalls/wasi/fd_fdstat_set_rights.rs → ...src/syscalls/wasi/fd_fdstat_set_rights.rs b/...src/syscalls/wasi/fd_fdstat_set_rights.rs → ...src/syscalls/wasi/fd_fdstat_set_rights.rs
diff --git a/...wasi/src/syscalls/wasi/fd_filestat_get.rs → ...asix/src/syscalls/wasi/fd_filestat_get.rs b/...wasi/src/syscalls/wasi/fd_filestat_get.rs → ...asix/src/syscalls/wasi/fd_filestat_get.rs
diff --git a/...src/syscalls/wasi/fd_filestat_set_size.rs → ...src/syscalls/wasi/fd_filestat_set_size.rs b/...src/syscalls/wasi/fd_filestat_set_size.rs → ...src/syscalls/wasi/fd_filestat_set_size.rs
diff --git a/...rc/syscalls/wasi/fd_filestat_set_times.rs → ...rc/syscalls/wasi/fd_filestat_set_times.rs b/...rc/syscalls/wasi/fd_filestat_set_times.rs → ...rc/syscalls/wasi/fd_filestat_set_times.rs
diff --git a/.../src/syscalls/wasi/fd_prestat_dir_name.rs → .../src/syscalls/wasi/fd_prestat_dir_name.rs b/.../src/syscalls/wasi/fd_prestat_dir_name.rs → .../src/syscalls/wasi/fd_prestat_dir_name.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_prestat_get.rs → ...wasix/src/syscalls/wasi/fd_prestat_get.rs b/lib/wasi/src/syscalls/wasi/fd_prestat_get.rs → ...wasix/src/syscalls/wasi/fd_prestat_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_read.rs → lib/wasix/src/syscalls/wasi/fd_read.rs b/lib/wasi/src/syscalls/wasi/fd_read.rs → lib/wasix/src/syscalls/wasi/fd_read.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_readdir.rs → lib/wasix/src/syscalls/wasi/fd_readdir.rs b/lib/wasi/src/syscalls/wasi/fd_readdir.rs → lib/wasix/src/syscalls/wasi/fd_readdir.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_renumber.rs → lib/wasix/src/syscalls/wasi/fd_renumber.rs b/lib/wasi/src/syscalls/wasi/fd_renumber.rs → lib/wasix/src/syscalls/wasi/fd_renumber.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_seek.rs → lib/wasix/src/syscalls/wasi/fd_seek.rs b/lib/wasi/src/syscalls/wasi/fd_seek.rs → lib/wasix/src/syscalls/wasi/fd_seek.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_sync.rs → lib/wasix/src/syscalls/wasi/fd_sync.rs b/lib/wasi/src/syscalls/wasi/fd_sync.rs → lib/wasix/src/syscalls/wasi/fd_sync.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_tell.rs → lib/wasix/src/syscalls/wasi/fd_tell.rs b/lib/wasi/src/syscalls/wasi/fd_tell.rs → lib/wasix/src/syscalls/wasi/fd_tell.rs
diff --git a/lib/wasi/src/syscalls/wasi/fd_write.rs → lib/wasix/src/syscalls/wasi/fd_write.rs b/lib/wasi/src/syscalls/wasi/fd_write.rs → lib/wasix/src/syscalls/wasi/fd_write.rs
diff --git a/lib/wasi/src/syscalls/wasi/mod.rs → lib/wasix/src/syscalls/wasi/mod.rs b/lib/wasi/src/syscalls/wasi/mod.rs → lib/wasix/src/syscalls/wasi/mod.rs
diff --git a/...rc/syscalls/wasi/path_create_directory.rs → ...rc/syscalls/wasi/path_create_directory.rs b/...rc/syscalls/wasi/path_create_directory.rs → ...rc/syscalls/wasi/path_create_directory.rs
diff --git a/...si/src/syscalls/wasi/path_filestat_get.rs → ...ix/src/syscalls/wasi/path_filestat_get.rs b/...si/src/syscalls/wasi/path_filestat_get.rs → ...ix/src/syscalls/wasi/path_filestat_get.rs
diff --git a/.../syscalls/wasi/path_filestat_set_times.rs → .../syscalls/wasi/path_filestat_set_times.rs b/.../syscalls/wasi/path_filestat_set_times.rs → .../syscalls/wasi/path_filestat_set_times.rs
diff --git a/lib/wasi/src/syscalls/wasi/path_link.rs → lib/wasix/src/syscalls/wasi/path_link.rs b/lib/wasi/src/syscalls/wasi/path_link.rs → lib/wasix/src/syscalls/wasi/path_link.rs
diff --git a/lib/wasi/src/syscalls/wasi/path_open.rs → lib/wasix/src/syscalls/wasi/path_open.rs b/lib/wasi/src/syscalls/wasi/path_open.rs → lib/wasix/src/syscalls/wasi/path_open.rs
diff --git a/lib/wasi/src/syscalls/wasi/path_readlink.rs → lib/wasix/src/syscalls/wasi/path_readlink.rs b/lib/wasi/src/syscalls/wasi/path_readlink.rs → lib/wasix/src/syscalls/wasi/path_readlink.rs
diff --git a/...rc/syscalls/wasi/path_remove_directory.rs → ...rc/syscalls/wasi/path_remove_directory.rs b/...rc/syscalls/wasi/path_remove_directory.rs → ...rc/syscalls/wasi/path_remove_directory.rs
diff --git a/lib/wasi/src/syscalls/wasi/path_rename.rs → lib/wasix/src/syscalls/wasi/path_rename.rs b/lib/wasi/src/syscalls/wasi/path_rename.rs → lib/wasix/src/syscalls/wasi/path_rename.rs
diff --git a/lib/wasi/src/syscalls/wasi/path_symlink.rs → lib/wasix/src/syscalls/wasi/path_symlink.rs b/lib/wasi/src/syscalls/wasi/path_symlink.rs → lib/wasix/src/syscalls/wasi/path_symlink.rs
diff --git a/...asi/src/syscalls/wasi/path_unlink_file.rs → ...six/src/syscalls/wasi/path_unlink_file.rs b/...asi/src/syscalls/wasi/path_unlink_file.rs → ...six/src/syscalls/wasi/path_unlink_file.rs
diff --git a/lib/wasi/src/syscalls/wasi/poll_oneoff.rs → lib/wasix/src/syscalls/wasi/poll_oneoff.rs b/lib/wasi/src/syscalls/wasi/poll_oneoff.rs → lib/wasix/src/syscalls/wasi/poll_oneoff.rs
diff --git a/lib/wasi/src/syscalls/wasi/proc_exit.rs → lib/wasix/src/syscalls/wasi/proc_exit.rs b/lib/wasi/src/syscalls/wasi/proc_exit.rs → lib/wasix/src/syscalls/wasi/proc_exit.rs
diff --git a/lib/wasi/src/syscalls/wasi/proc_raise.rs → lib/wasix/src/syscalls/wasi/proc_raise.rs b/lib/wasi/src/syscalls/wasi/proc_raise.rs → lib/wasix/src/syscalls/wasi/proc_raise.rs
diff --git a/lib/wasi/src/syscalls/wasi/random_get.rs → lib/wasix/src/syscalls/wasi/random_get.rs b/lib/wasi/src/syscalls/wasi/random_get.rs → lib/wasix/src/syscalls/wasi/random_get.rs
diff --git a/lib/wasi/src/syscalls/wasi/thread_spawn.rs → lib/wasix/src/syscalls/wasi/thread_spawn.rs b/lib/wasi/src/syscalls/wasi/thread_spawn.rs → lib/wasix/src/syscalls/wasi/thread_spawn.rs
diff --git a/...asi/src/syscalls/wasix/callback_signal.rs → ...six/src/syscalls/wasix/callback_signal.rs b/...asi/src/syscalls/wasix/callback_signal.rs → ...six/src/syscalls/wasix/callback_signal.rs
diff --git a/lib/wasi/src/syscalls/wasix/chdir.rs → lib/wasix/src/syscalls/wasix/chdir.rs b/lib/wasi/src/syscalls/wasix/chdir.rs → lib/wasix/src/syscalls/wasix/chdir.rs
diff --git a/lib/wasi/src/syscalls/wasix/fd_pipe.rs → lib/wasix/src/syscalls/wasix/fd_pipe.rs b/lib/wasi/src/syscalls/wasix/fd_pipe.rs → lib/wasix/src/syscalls/wasix/fd_pipe.rs
diff --git a/lib/wasi/src/syscalls/wasix/futex_wait.rs → lib/wasix/src/syscalls/wasix/futex_wait.rs b/lib/wasi/src/syscalls/wasix/futex_wait.rs → lib/wasix/src/syscalls/wasix/futex_wait.rs
diff --git a/lib/wasi/src/syscalls/wasix/futex_wake.rs → lib/wasix/src/syscalls/wasix/futex_wake.rs b/lib/wasi/src/syscalls/wasix/futex_wake.rs → lib/wasix/src/syscalls/wasix/futex_wake.rs
diff --git a/...wasi/src/syscalls/wasix/futex_wake_all.rs → ...asix/src/syscalls/wasix/futex_wake_all.rs b/...wasi/src/syscalls/wasix/futex_wake_all.rs → ...asix/src/syscalls/wasix/futex_wake_all.rs
diff --git a/lib/wasi/src/syscalls/wasix/getcwd.rs → lib/wasix/src/syscalls/wasix/getcwd.rs b/lib/wasi/src/syscalls/wasix/getcwd.rs → lib/wasix/src/syscalls/wasix/getcwd.rs
diff --git a/lib/wasi/src/syscalls/wasix/mod.rs → lib/wasix/src/syscalls/wasix/mod.rs b/lib/wasi/src/syscalls/wasix/mod.rs → lib/wasix/src/syscalls/wasix/mod.rs
diff --git a/lib/wasi/src/syscalls/wasix/port_addr_add.rs → ...wasix/src/syscalls/wasix/port_addr_add.rs b/lib/wasi/src/syscalls/wasix/port_addr_add.rs → ...wasix/src/syscalls/wasix/port_addr_add.rs
diff --git a/...asi/src/syscalls/wasix/port_addr_clear.rs → ...six/src/syscalls/wasix/port_addr_clear.rs b/...asi/src/syscalls/wasix/port_addr_clear.rs → ...six/src/syscalls/wasix/port_addr_clear.rs
diff --git a/...wasi/src/syscalls/wasix/port_addr_list.rs → ...asix/src/syscalls/wasix/port_addr_list.rs b/...wasi/src/syscalls/wasix/port_addr_list.rs → ...asix/src/syscalls/wasix/port_addr_list.rs
diff --git a/...si/src/syscalls/wasix/port_addr_remove.rs → ...ix/src/syscalls/wasix/port_addr_remove.rs b/...si/src/syscalls/wasix/port_addr_remove.rs → ...ix/src/syscalls/wasix/port_addr_remove.rs
diff --git a/lib/wasi/src/syscalls/wasix/port_bridge.rs → lib/wasix/src/syscalls/wasix/port_bridge.rs b/lib/wasi/src/syscalls/wasix/port_bridge.rs → lib/wasix/src/syscalls/wasix/port_bridge.rs
diff --git a/...i/src/syscalls/wasix/port_dhcp_acquire.rs → ...x/src/syscalls/wasix/port_dhcp_acquire.rs b/...i/src/syscalls/wasix/port_dhcp_acquire.rs → ...x/src/syscalls/wasix/port_dhcp_acquire.rs
diff --git a/...si/src/syscalls/wasix/port_gateway_set.rs → ...ix/src/syscalls/wasix/port_gateway_set.rs b/...si/src/syscalls/wasix/port_gateway_set.rs → ...ix/src/syscalls/wasix/port_gateway_set.rs
diff --git a/lib/wasi/src/syscalls/wasix/port_mac.rs → lib/wasix/src/syscalls/wasix/port_mac.rs b/lib/wasi/src/syscalls/wasix/port_mac.rs → lib/wasix/src/syscalls/wasix/port_mac.rs
diff --git a/...wasi/src/syscalls/wasix/port_route_add.rs → ...asix/src/syscalls/wasix/port_route_add.rs b/...wasi/src/syscalls/wasix/port_route_add.rs → ...asix/src/syscalls/wasix/port_route_add.rs
diff --git a/...si/src/syscalls/wasix/port_route_clear.rs → ...ix/src/syscalls/wasix/port_route_clear.rs b/...si/src/syscalls/wasix/port_route_clear.rs → ...ix/src/syscalls/wasix/port_route_clear.rs
diff --git a/...asi/src/syscalls/wasix/port_route_list.rs → ...six/src/syscalls/wasix/port_route_list.rs b/...asi/src/syscalls/wasix/port_route_list.rs → ...six/src/syscalls/wasix/port_route_list.rs
diff --git a/...i/src/syscalls/wasix/port_route_remove.rs → ...x/src/syscalls/wasix/port_route_remove.rs b/...i/src/syscalls/wasix/port_route_remove.rs → ...x/src/syscalls/wasix/port_route_remove.rs
diff --git a/lib/wasi/src/syscalls/wasix/port_unbridge.rs → ...wasix/src/syscalls/wasix/port_unbridge.rs b/lib/wasi/src/syscalls/wasix/port_unbridge.rs → ...wasix/src/syscalls/wasix/port_unbridge.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_exec.rs → lib/wasix/src/syscalls/wasix/proc_exec.rs b/lib/wasi/src/syscalls/wasix/proc_exec.rs → lib/wasix/src/syscalls/wasix/proc_exec.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_fork.rs → lib/wasix/src/syscalls/wasix/proc_fork.rs b/lib/wasi/src/syscalls/wasix/proc_fork.rs → lib/wasix/src/syscalls/wasix/proc_fork.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_id.rs → lib/wasix/src/syscalls/wasix/proc_id.rs b/lib/wasi/src/syscalls/wasix/proc_id.rs → lib/wasix/src/syscalls/wasix/proc_id.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_join.rs → lib/wasix/src/syscalls/wasix/proc_join.rs b/lib/wasi/src/syscalls/wasix/proc_join.rs → lib/wasix/src/syscalls/wasix/proc_join.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_parent.rs → lib/wasix/src/syscalls/wasix/proc_parent.rs b/lib/wasi/src/syscalls/wasix/proc_parent.rs → lib/wasix/src/syscalls/wasix/proc_parent.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_signal.rs → lib/wasix/src/syscalls/wasix/proc_signal.rs b/lib/wasi/src/syscalls/wasix/proc_signal.rs → lib/wasix/src/syscalls/wasix/proc_signal.rs
diff --git a/lib/wasi/src/syscalls/wasix/proc_spawn.rs → lib/wasix/src/syscalls/wasix/proc_spawn.rs b/lib/wasi/src/syscalls/wasix/proc_spawn.rs → lib/wasix/src/syscalls/wasix/proc_spawn.rs
diff --git a/lib/wasi/src/syscalls/wasix/resolve.rs → lib/wasix/src/syscalls/wasix/resolve.rs b/lib/wasi/src/syscalls/wasix/resolve.rs → lib/wasix/src/syscalls/wasix/resolve.rs
diff --git a/lib/wasi/src/syscalls/wasix/sched_yield.rs → lib/wasix/src/syscalls/wasix/sched_yield.rs b/lib/wasi/src/syscalls/wasix/sched_yield.rs → lib/wasix/src/syscalls/wasix/sched_yield.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_accept.rs → lib/wasix/src/syscalls/wasix/sock_accept.rs b/lib/wasi/src/syscalls/wasix/sock_accept.rs → lib/wasix/src/syscalls/wasix/sock_accept.rs
diff --git a/...asi/src/syscalls/wasix/sock_addr_local.rs → ...six/src/syscalls/wasix/sock_addr_local.rs b/...asi/src/syscalls/wasix/sock_addr_local.rs → ...six/src/syscalls/wasix/sock_addr_local.rs
diff --git a/...wasi/src/syscalls/wasix/sock_addr_peer.rs → ...asix/src/syscalls/wasix/sock_addr_peer.rs b/...wasi/src/syscalls/wasix/sock_addr_peer.rs → ...asix/src/syscalls/wasix/sock_addr_peer.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_bind.rs → lib/wasix/src/syscalls/wasix/sock_bind.rs b/lib/wasi/src/syscalls/wasix/sock_bind.rs → lib/wasix/src/syscalls/wasix/sock_bind.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_connect.rs → lib/wasix/src/syscalls/wasix/sock_connect.rs b/lib/wasi/src/syscalls/wasix/sock_connect.rs → lib/wasix/src/syscalls/wasix/sock_connect.rs
diff --git a/...i/src/syscalls/wasix/sock_get_opt_flag.rs → ...x/src/syscalls/wasix/sock_get_opt_flag.rs b/...i/src/syscalls/wasix/sock_get_opt_flag.rs → ...x/src/syscalls/wasix/sock_get_opt_flag.rs
diff --git a/...i/src/syscalls/wasix/sock_get_opt_size.rs → ...x/src/syscalls/wasix/sock_get_opt_size.rs b/...i/src/syscalls/wasix/sock_get_opt_size.rs → ...x/src/syscalls/wasix/sock_get_opt_size.rs
diff --git a/...i/src/syscalls/wasix/sock_get_opt_time.rs → ...x/src/syscalls/wasix/sock_get_opt_time.rs b/...i/src/syscalls/wasix/sock_get_opt_time.rs → ...x/src/syscalls/wasix/sock_get_opt_time.rs
diff --git a/.../syscalls/wasix/sock_join_multicast_v4.rs → .../syscalls/wasix/sock_join_multicast_v4.rs b/.../syscalls/wasix/sock_join_multicast_v4.rs → .../syscalls/wasix/sock_join_multicast_v4.rs
diff --git a/.../syscalls/wasix/sock_join_multicast_v6.rs → .../syscalls/wasix/sock_join_multicast_v6.rs b/.../syscalls/wasix/sock_join_multicast_v6.rs → .../syscalls/wasix/sock_join_multicast_v6.rs
diff --git a/...syscalls/wasix/sock_leave_multicast_v4.rs → ...syscalls/wasix/sock_leave_multicast_v4.rs b/...syscalls/wasix/sock_leave_multicast_v4.rs → ...syscalls/wasix/sock_leave_multicast_v4.rs
diff --git a/...syscalls/wasix/sock_leave_multicast_v6.rs → ...syscalls/wasix/sock_leave_multicast_v6.rs b/...syscalls/wasix/sock_leave_multicast_v6.rs → ...syscalls/wasix/sock_leave_multicast_v6.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_listen.rs → lib/wasix/src/syscalls/wasix/sock_listen.rs b/lib/wasi/src/syscalls/wasix/sock_listen.rs → lib/wasix/src/syscalls/wasix/sock_listen.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_open.rs → lib/wasix/src/syscalls/wasix/sock_open.rs b/lib/wasi/src/syscalls/wasix/sock_open.rs → lib/wasix/src/syscalls/wasix/sock_open.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_recv.rs → lib/wasix/src/syscalls/wasix/sock_recv.rs b/lib/wasi/src/syscalls/wasix/sock_recv.rs → lib/wasix/src/syscalls/wasix/sock_recv.rs
diff --git a/...wasi/src/syscalls/wasix/sock_recv_from.rs → ...asix/src/syscalls/wasix/sock_recv_from.rs b/...wasi/src/syscalls/wasix/sock_recv_from.rs → ...asix/src/syscalls/wasix/sock_recv_from.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_send.rs → lib/wasix/src/syscalls/wasix/sock_send.rs b/lib/wasi/src/syscalls/wasix/sock_send.rs → lib/wasix/src/syscalls/wasix/sock_send.rs
diff --git a/...wasi/src/syscalls/wasix/sock_send_file.rs → ...asix/src/syscalls/wasix/sock_send_file.rs b/...wasi/src/syscalls/wasix/sock_send_file.rs → ...asix/src/syscalls/wasix/sock_send_file.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_send_to.rs → lib/wasix/src/syscalls/wasix/sock_send_to.rs b/lib/wasi/src/syscalls/wasix/sock_send_to.rs → lib/wasix/src/syscalls/wasix/sock_send_to.rs
diff --git a/...i/src/syscalls/wasix/sock_set_opt_flag.rs → ...x/src/syscalls/wasix/sock_set_opt_flag.rs b/...i/src/syscalls/wasix/sock_set_opt_flag.rs → ...x/src/syscalls/wasix/sock_set_opt_flag.rs
diff --git a/...i/src/syscalls/wasix/sock_set_opt_size.rs → ...x/src/syscalls/wasix/sock_set_opt_size.rs b/...i/src/syscalls/wasix/sock_set_opt_size.rs → ...x/src/syscalls/wasix/sock_set_opt_size.rs
diff --git a/...i/src/syscalls/wasix/sock_set_opt_time.rs → ...x/src/syscalls/wasix/sock_set_opt_time.rs b/...i/src/syscalls/wasix/sock_set_opt_time.rs → ...x/src/syscalls/wasix/sock_set_opt_time.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_shutdown.rs → ...wasix/src/syscalls/wasix/sock_shutdown.rs b/lib/wasi/src/syscalls/wasix/sock_shutdown.rs → ...wasix/src/syscalls/wasix/sock_shutdown.rs
diff --git a/lib/wasi/src/syscalls/wasix/sock_status.rs → lib/wasix/src/syscalls/wasix/sock_status.rs b/lib/wasi/src/syscalls/wasix/sock_status.rs → lib/wasix/src/syscalls/wasix/sock_status.rs
diff --git a/...si/src/syscalls/wasix/stack_checkpoint.rs → ...ix/src/syscalls/wasix/stack_checkpoint.rs b/...si/src/syscalls/wasix/stack_checkpoint.rs → ...ix/src/syscalls/wasix/stack_checkpoint.rs
diff --git a/lib/wasi/src/syscalls/wasix/stack_restore.rs → ...wasix/src/syscalls/wasix/stack_restore.rs b/lib/wasi/src/syscalls/wasix/stack_restore.rs → ...wasix/src/syscalls/wasix/stack_restore.rs
diff --git a/lib/wasi/src/syscalls/wasix/thread_exit.rs → lib/wasix/src/syscalls/wasix/thread_exit.rs b/lib/wasi/src/syscalls/wasix/thread_exit.rs → lib/wasix/src/syscalls/wasix/thread_exit.rs
diff --git a/lib/wasi/src/syscalls/wasix/thread_id.rs → lib/wasix/src/syscalls/wasix/thread_id.rs b/lib/wasi/src/syscalls/wasix/thread_id.rs → lib/wasix/src/syscalls/wasix/thread_id.rs
diff --git a/lib/wasi/src/syscalls/wasix/thread_join.rs → lib/wasix/src/syscalls/wasix/thread_join.rs b/lib/wasi/src/syscalls/wasix/thread_join.rs → lib/wasix/src/syscalls/wasix/thread_join.rs
diff --git a/.../src/syscalls/wasix/thread_parallelism.rs → .../src/syscalls/wasix/thread_parallelism.rs b/.../src/syscalls/wasix/thread_parallelism.rs → .../src/syscalls/wasix/thread_parallelism.rs
diff --git a/lib/wasi/src/syscalls/wasix/thread_signal.rs → ...wasix/src/syscalls/wasix/thread_signal.rs b/lib/wasi/src/syscalls/wasix/thread_signal.rs → ...wasix/src/syscalls/wasix/thread_signal.rs
diff --git a/lib/wasi/src/syscalls/wasix/thread_sleep.rs → lib/wasix/src/syscalls/wasix/thread_sleep.rs b/lib/wasi/src/syscalls/wasix/thread_sleep.rs → lib/wasix/src/syscalls/wasix/thread_sleep.rs
diff --git a/lib/wasi/src/syscalls/wasix/thread_spawn.rs → lib/wasix/src/syscalls/wasix/thread_spawn.rs b/lib/wasi/src/syscalls/wasix/thread_spawn.rs → lib/wasix/src/syscalls/wasix/thread_spawn.rs
diff --git a/lib/wasi/src/syscalls/wasix/tty_get.rs → lib/wasix/src/syscalls/wasix/tty_get.rs b/lib/wasi/src/syscalls/wasix/tty_get.rs → lib/wasix/src/syscalls/wasix/tty_get.rs
diff --git a/lib/wasi/src/syscalls/wasix/tty_set.rs → lib/wasix/src/syscalls/wasix/tty_set.rs b/lib/wasi/src/syscalls/wasix/tty_set.rs → lib/wasix/src/syscalls/wasix/tty_set.rs
diff --git a/lib/wasi/src/syscalls/wasm.rs → lib/wasix/src/syscalls/wasm.rs b/lib/wasi/src/syscalls/wasm.rs → lib/wasix/src/syscalls/wasm.rs
diff --git a/lib/wasi/src/syscalls/windows.rs → lib/wasix/src/syscalls/windows.rs b/lib/wasi/src/syscalls/windows.rs → lib/wasix/src/syscalls/windows.rs
diff --git a/lib/wasi/src/utils/dummy_waker.rs → lib/wasix/src/utils/dummy_waker.rs b/lib/wasi/src/utils/dummy_waker.rs → lib/wasix/src/utils/dummy_waker.rs
diff --git a/lib/wasi/src/utils/mod.rs → lib/wasix/src/utils/mod.rs b/lib/wasi/src/utils/mod.rs → lib/wasix/src/utils/mod.rs
diff --git a/lib/wasi/src/utils/owned_mutex_guard.rs → lib/wasix/src/utils/owned_mutex_guard.rs b/lib/wasi/src/utils/owned_mutex_guard.rs → lib/wasix/src/utils/owned_mutex_guard.rs
diff --git a/lib/wasi/src/utils/store.rs → lib/wasix/src/utils/store.rs b/lib/wasi/src/utils/store.rs → lib/wasix/src/utils/store.rs
diff --git a/lib/wasi/src/utils/thread_parker.rs → lib/wasix/src/utils/thread_parker.rs b/lib/wasi/src/utils/thread_parker.rs → lib/wasix/src/utils/thread_parker.rs
diff --git a/lib/wasi/tests/README.md → lib/wasix/tests/README.md b/lib/wasi/tests/README.md → lib/wasix/tests/README.md
@@ -6,7 +6,7 @@ We should see these four directories by default
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift -- ../wasi/tests/coreutils.wasm ls
+cargo run --features compiler,cranelift -- ../wasix/tests/coreutils.wasm ls
 ```
 
 Expected:
@@ -25,7 +25,7 @@ send it both to the console and to the file
 
 ```sh
 cd ../../cli
-echo blah | cargo run --features compiler,cranelift -- ../wasi/tests/coreutils.wasm tee /dev/stderr
+echo blah | cargo run --features compiler,cranelift -- ../wasix/tests/coreutils.wasm tee /dev/stderr
 ```
 
 Expected:
@@ -42,7 +42,7 @@ needs to continue to pass.
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- ../wasi/tests/example-condvar.wasm
+cargo run --features compiler,cranelift,debug -- ../wasix/tests/example-condvar.wasm
 ```
 
 Expected:
@@ -68,7 +68,7 @@ Piping to cowsay should, well.... display a cow that says something
 
 ```sh
 cd ../../cli
-echo blah | cargo run --features compiler,cranelift,debug -- ../wasi/tests/cowsay.wasm
+echo blah | cargo run --features compiler,cranelift,debug -- ../wasix/tests/cowsay.wasm
 ```
 
 Expected:
@@ -91,7 +91,7 @@ in `tokio` in order to wake up the main IO thread that is blocked on an `poll_on
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- ../wasi/tests/example-epoll.wasm
+cargo run --features compiler,cranelift,debug -- ../wasix/tests/example-epoll.wasm
 ```
 
 Expected:
@@ -117,7 +117,7 @@ file handles (which is needed for stdin and stdout redirection)
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --use sharrattj/coreutils --enable-threads ../wasi/tests/example
+cargo run --features compiler,cranelift,debug -- --use sharrattj/coreutils --enable-threads ../wasix/tests/example
 -execve.wasm
 ```
 
@@ -139,7 +139,7 @@ is often used for exception handling
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-longjmp.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-longjmp.wasm
 ```
 
 Expected:
@@ -160,7 +160,7 @@ This one is initiated from `rust` code and thus has the risk of leaking memory b
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-stack.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-stack.wasm
 ```
 
 Expected:
@@ -178,7 +178,7 @@ Simple fork example that is a crude multi-threading implementation - used by `da
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-fork.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-fork.wasm
 ```
 
 Expected:
@@ -196,7 +196,7 @@ been recorded are preserved after a fork. The behavior is needed for `dash`
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-fork-longjmp.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-fork-longjmp.wasm
 ```
 
 Expected:
@@ -213,7 +213,7 @@ full multi-threading with shared memory and shared compiled modules
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-multi-threading.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-multi-threading.wasm
 ```
 
 Expected:
@@ -248,7 +248,7 @@ the process to write and read to this pipe.
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-pipe.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-pipe.wasm
 ```
 
 Expected:
@@ -263,7 +263,7 @@ this text should be printed by the parent
 Tests that signals can be received and processed by WASM applications
 
 ```sh
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-signal.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-signal.wasm
 ```
 
 Note: This test requires that a signal is sent to the process asynchronously
@@ -285,7 +285,7 @@ Puts the process to sleep for 50ms
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-sleep.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-sleep.wasm
 ```
 
 Expected:
@@ -299,7 +299,7 @@ Uses `posix_spawn` to launch a sub-process and wait on it to exit
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads --use sharrattj/coreutils ../wasi/tests/example
+cargo run --features compiler,cranelift,debug -- --enable-threads --use sharrattj/coreutils ../wasix/tests/example
 -spawn.wasm
 ```
 
@@ -317,7 +317,7 @@ Connects to 8.8.8.8:53 over TCP to verify TCP clients work
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-tcp-client.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-tcp-client.wasm
 ```
 
 Expected:
@@ -333,7 +333,7 @@ Waits for a connection after listening on 127.0.0.1:7878
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-tcp-listener.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-tcp-listener.wasm
 ```
 
 In order to test this a curl command is needed below asynchronously and then it needs to be killed
@@ -355,7 +355,7 @@ Tests that thread local variables work correctly
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-thread-local.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-thread-local.wasm
 ```
 
 Expected:
@@ -422,7 +422,7 @@ open file descriptors works correctly.
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads ../wasi/tests/example-vfork.wasm
+cargo run --features compiler,cranelift,debug -- --enable-threads ../wasix/tests/example-vfork.wasm
 ```
 
 Expected:
@@ -440,7 +440,7 @@ and mapped directories to serve HTTP content.
 
 ```sh
 cd ../../cli
-cargo run --features compiler,cranelift,debug -- --enable-threads --mapdir /public:/prog/deploy/wasmer-web/public ../wasi/tests/web-server.wasm -- --port 8080 --log-level trace
+cargo run --features compiler,cranelift,debug -- --enable-threads --mapdir /public:/prog/deploy/wasmer-web/public ../wasix/tests/web-server.wasm -- --port 8080 --log-level trace
 ```
 
 Note: This requires that a curl command be made to the HTTP server asynchronously

diff --git a/lib/wasi/tests/envvar.rs → lib/wasix/tests/envvar.rs b/lib/wasi/tests/envvar.rs → lib/wasix/tests/envvar.rs
diff --git a/lib/wasi/tests/envvar.wasm → lib/wasix/tests/envvar.wasm b/lib/wasi/tests/envvar.wasm → lib/wasix/tests/envvar.wasm
diff --git a/lib/wasi/tests/envvar.wat → lib/wasix/tests/envvar.wat b/lib/wasi/tests/envvar.wat → lib/wasix/tests/envvar.wat
diff --git a/lib/wasi/tests/example-condvar.wasm → lib/wasix/tests/example-condvar.wasm b/lib/wasi/tests/example-condvar.wasm → lib/wasix/tests/example-condvar.wasm
diff --git a/lib/wasi/tests/example-epoll.wasm → lib/wasix/tests/example-epoll.wasm b/lib/wasi/tests/example-epoll.wasm → lib/wasix/tests/example-epoll.wasm
diff --git a/lib/wasi/tests/example-execve.wasm → lib/wasix/tests/example-execve.wasm b/lib/wasi/tests/example-execve.wasm → lib/wasix/tests/example-execve.wasm
diff --git a/lib/wasi/tests/example-fork-longjmp.wasm → lib/wasix/tests/example-fork-longjmp.wasm b/lib/wasi/tests/example-fork-longjmp.wasm → lib/wasix/tests/example-fork-longjmp.wasm
diff --git a/lib/wasi/tests/example-fork.wasm → lib/wasix/tests/example-fork.wasm b/lib/wasi/tests/example-fork.wasm → lib/wasix/tests/example-fork.wasm
diff --git a/lib/wasi/tests/example-longjmp.wasm → lib/wasix/tests/example-longjmp.wasm b/lib/wasi/tests/example-longjmp.wasm → lib/wasix/tests/example-longjmp.wasm
diff --git a/lib/wasi/tests/example-pipe.wasm → lib/wasix/tests/example-pipe.wasm b/lib/wasi/tests/example-pipe.wasm → lib/wasix/tests/example-pipe.wasm
diff --git a/lib/wasi/tests/example-signal.wasm → lib/wasix/tests/example-signal.wasm b/lib/wasi/tests/example-signal.wasm → lib/wasix/tests/example-signal.wasm
diff --git a/lib/wasi/tests/example-sleep.wasm → lib/wasix/tests/example-sleep.wasm b/lib/wasi/tests/example-sleep.wasm → lib/wasix/tests/example-sleep.wasm
diff --git a/lib/wasi/tests/example-spawn.wasm → lib/wasix/tests/example-spawn.wasm b/lib/wasi/tests/example-spawn.wasm → lib/wasix/tests/example-spawn.wasm
diff --git a/lib/wasi/tests/example-stack.wasm → lib/wasix/tests/example-stack.wasm b/lib/wasi/tests/example-stack.wasm → lib/wasix/tests/example-stack.wasm
diff --git a/lib/wasi/tests/example-tcp-client.wasm → lib/wasix/tests/example-tcp-client.wasm b/lib/wasi/tests/example-tcp-client.wasm → lib/wasix/tests/example-tcp-client.wasm
diff --git a/lib/wasi/tests/example-tcp-listener.wasm → lib/wasix/tests/example-tcp-listener.wasm b/lib/wasi/tests/example-tcp-listener.wasm → lib/wasix/tests/example-tcp-listener.wasm
diff --git a/lib/wasi/tests/example-thread-local.wasm → lib/wasix/tests/example-thread-local.wasm b/lib/wasi/tests/example-thread-local.wasm → lib/wasix/tests/example-thread-local.wasm
diff --git a/lib/wasi/tests/example-vfork.wasm → lib/wasix/tests/example-vfork.wasm b/lib/wasi/tests/example-vfork.wasm → lib/wasix/tests/example-vfork.wasm
diff --git a/lib/wasi/tests/runners.rs → lib/wasix/tests/runners.rs b/lib/wasi/tests/runners.rs → lib/wasix/tests/runners.rs
diff --git a/lib/wasi/tests/stack.wasm → lib/wasix/tests/stack.wasm b/lib/wasi/tests/stack.wasm → lib/wasix/tests/stack.wasm
diff --git a/lib/wasi/tests/stdin-hello.wasm → lib/wasix/tests/stdin-hello.wasm b/lib/wasi/tests/stdin-hello.wasm → lib/wasix/tests/stdin-hello.wasm
diff --git a/lib/wasi/tests/stdio.rs → lib/wasix/tests/stdio.rs b/lib/wasi/tests/stdio.rs → lib/wasix/tests/stdio.rs
diff --git a/lib/wasi/tests/web-server.wasm → lib/wasix/tests/web-server.wasm b/lib/wasi/tests/web-server.wasm → lib/wasix/tests/web-server.wasm
diff --git a/lib/wasi/wia/wasixx_32v1.txt → lib/wasix/wia/wasixx_32v1.txt b/lib/wasi/wia/wasixx_32v1.txt → lib/wasix/wia/wasixx_32v1.txt
diff --git a/lib/wasi/wia/wasixx_64v1.txt → lib/wasix/wia/wasixx_64v1.txt b/lib/wasi/wia/wasixx_64v1.txt → lib/wasix/wia/wasixx_64v1.txt
diff --git a/lib/wasi/wia/wasm_bus.txt → lib/wasix/wia/wasm_bus.txt b/lib/wasi/wia/wasm_bus.txt → lib/wasix/wia/wasm_bus.txt
diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 wasmer = { path = "../../../lib/api", version = "=4.0.0-beta.1", default-features = false }
-wasmer-wasix = { path = "../../../lib/wasi", version = "0.6.0" }
+wasmer-wasix = { path = "../../../lib/wasix", version = "0.6.0" }
 virtual-fs = { path = "../../../lib/virtual-fs", version = "0.4.0" }
 wast = "38.0"
 serde = "1"