refactor: Align virtual-fs and virtual-net directories with crate names

Partial solution for #3785 NOTE: this PR does not yet rename wasi to wasix, because some other larger feature work is pending that should be merged first to avoid conflicts.
wasmerio · May 16, 2023 · 6863965 · 6863965
1 parent 04a6b6b
commit 6863965
Show file tree

Hide file tree

Showing 39 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,8 +41,8 @@ members = [
     "lib/derive",
     "lib/emscripten",
     "lib/object",
-    "lib/vfs",
-    "lib/vnet",
+    "lib/virtual-fs",
+    "lib/virtual-net",
     "lib/sys-utils",
     "lib/vm",
     "lib/wai-bindgen-wasmer",

diff --git a/Makefile b/Makefile
@@ -536,7 +536,7 @@ test-stage-2-test-compiler-cranelift-nostd:
 test-stage-3-test-compiler-singlepass-nostd:
 	$(CARGO_BINARY) test $(CARGO_TARGET_FLAG) --manifest-path lib/compiler-singlepass/Cargo.toml --release --no-default-features --features=std
 test-stage-4-wasmer-cli:
-	$(CARGO_BINARY) test $(CARGO_TARGET_FLAG) --manifest-path lib/vfs/Cargo.toml --release
+	$(CARGO_BINARY) test $(CARGO_TARGET_FLAG) --manifest-path lib/virtual-fs/Cargo.toml --release
 	$(CARGO_BINARY) test $(CARGO_TARGET_FLAG) --manifest-path lib/cli/Cargo.toml $(compiler_features) --release
 
 # test examples

diff --git a/lib/c-api/Cargo.toml b/lib/c-api/Cargo.toml
@@ -32,7 +32,7 @@ wasmer-middlewares = { version = "=3.3.0", path = "../middlewares", optional = t
 wasmer-types = { version = "=3.3.0", path = "../types" }
 wasmer-wasix = { version = "0.4.0", path = "../wasi", features = ["host-fs", "host-vnet"], optional = true }
 webc = { version = "5.0", optional = true }
-virtual-fs = { version = "0.2.0", path = "../vfs", optional = true, default-features = false, features = ["static-fs"] }
+virtual-fs = { version = "0.2.0", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] }
 enumset = "1.0.2"
 cfg-if = "1.0"
 lazy_static = "1.4"

diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -40,8 +40,8 @@ wasmer-cache = { version = "=3.3.0", path = "../cache", features = ["blake3-pure
 wasmer-types = { version = "=3.3.0", path = "../types", features = ["enable-serde"] }
 wasmer-registry = { version = "4.5.0", path = "../registry", features = ["build-package"]  }
 wasmer-object = { version = "=3.3.0", path = "../object", optional = true }
-virtual-fs  = { version = "0.2.0", path = "../vfs", default-features = false, features = ["host-fs"] }
-virtual-net  = { version = "0.1.0", path = "../vnet" }
+virtual-fs  = { version = "0.2.0", path = "../virtual-fs", default-features = false, features = ["host-fs"] }
+virtual-net  = { version = "0.1.0", path = "../virtual-net" }
 
 # Wasmer-owned dependencies.
 webc = { version = "5.0" }

diff --git a/lib/vfs/Cargo.toml → lib/virtual-fs/Cargo.toml b/lib/vfs/Cargo.toml → lib/virtual-fs/Cargo.toml
diff --git a/lib/vfs/src/arc_box_file.rs → lib/virtual-fs/src/arc_box_file.rs b/lib/vfs/src/arc_box_file.rs → lib/virtual-fs/src/arc_box_file.rs
diff --git a/lib/vfs/src/arc_file.rs → lib/virtual-fs/src/arc_file.rs b/lib/vfs/src/arc_file.rs → lib/virtual-fs/src/arc_file.rs
diff --git a/lib/vfs/src/arc_fs.rs → lib/virtual-fs/src/arc_fs.rs b/lib/vfs/src/arc_fs.rs → lib/virtual-fs/src/arc_fs.rs
diff --git a/lib/vfs/src/builder.rs → lib/virtual-fs/src/builder.rs b/lib/vfs/src/builder.rs → lib/virtual-fs/src/builder.rs
diff --git a/lib/vfs/src/combine_file.rs → lib/virtual-fs/src/combine_file.rs b/lib/vfs/src/combine_file.rs → lib/virtual-fs/src/combine_file.rs
diff --git a/lib/vfs/src/dual_write_file.rs → lib/virtual-fs/src/dual_write_file.rs b/lib/vfs/src/dual_write_file.rs → lib/virtual-fs/src/dual_write_file.rs
diff --git a/lib/vfs/src/empty_fs.rs → lib/virtual-fs/src/empty_fs.rs b/lib/vfs/src/empty_fs.rs → lib/virtual-fs/src/empty_fs.rs
diff --git a/lib/vfs/src/filesystems.rs → lib/virtual-fs/src/filesystems.rs b/lib/vfs/src/filesystems.rs → lib/virtual-fs/src/filesystems.rs
diff --git a/lib/vfs/src/host_fs.rs → lib/virtual-fs/src/host_fs.rs b/lib/vfs/src/host_fs.rs → lib/virtual-fs/src/host_fs.rs
diff --git a/lib/vfs/src/lib.rs → lib/virtual-fs/src/lib.rs b/lib/vfs/src/lib.rs → lib/virtual-fs/src/lib.rs
diff --git a/lib/vfs/src/mem_fs/file.rs → lib/virtual-fs/src/mem_fs/file.rs b/lib/vfs/src/mem_fs/file.rs → lib/virtual-fs/src/mem_fs/file.rs
diff --git a/lib/vfs/src/mem_fs/file_opener.rs → lib/virtual-fs/src/mem_fs/file_opener.rs b/lib/vfs/src/mem_fs/file_opener.rs → lib/virtual-fs/src/mem_fs/file_opener.rs
diff --git a/lib/vfs/src/mem_fs/filesystem.rs → lib/virtual-fs/src/mem_fs/filesystem.rs b/lib/vfs/src/mem_fs/filesystem.rs → lib/virtual-fs/src/mem_fs/filesystem.rs
diff --git a/lib/vfs/src/mem_fs/mod.rs → lib/virtual-fs/src/mem_fs/mod.rs b/lib/vfs/src/mem_fs/mod.rs → lib/virtual-fs/src/mem_fs/mod.rs
diff --git a/lib/vfs/src/mem_fs/stdio.rs → lib/virtual-fs/src/mem_fs/stdio.rs b/lib/vfs/src/mem_fs/stdio.rs → lib/virtual-fs/src/mem_fs/stdio.rs
diff --git a/lib/vfs/src/null_file.rs → lib/virtual-fs/src/null_file.rs b/lib/vfs/src/null_file.rs → lib/virtual-fs/src/null_file.rs
diff --git a/lib/vfs/src/ops.rs → lib/virtual-fs/src/ops.rs b/lib/vfs/src/ops.rs → lib/virtual-fs/src/ops.rs
diff --git a/lib/vfs/src/overlay_fs.rs → lib/virtual-fs/src/overlay_fs.rs b/lib/vfs/src/overlay_fs.rs → lib/virtual-fs/src/overlay_fs.rs
diff --git a/lib/vfs/src/passthru_fs.rs → lib/virtual-fs/src/passthru_fs.rs b/lib/vfs/src/passthru_fs.rs → lib/virtual-fs/src/passthru_fs.rs
diff --git a/lib/vfs/src/pipe.rs → lib/virtual-fs/src/pipe.rs b/lib/vfs/src/pipe.rs → lib/virtual-fs/src/pipe.rs
diff --git a/lib/vfs/src/random_file.rs → lib/virtual-fs/src/random_file.rs b/lib/vfs/src/random_file.rs → lib/virtual-fs/src/random_file.rs
diff --git a/lib/vfs/src/special_file.rs → lib/virtual-fs/src/special_file.rs b/lib/vfs/src/special_file.rs → lib/virtual-fs/src/special_file.rs
diff --git a/lib/vfs/src/static_fs.rs → lib/virtual-fs/src/static_fs.rs b/lib/vfs/src/static_fs.rs → lib/virtual-fs/src/static_fs.rs
diff --git a/lib/vfs/src/tmp_fs.rs → lib/virtual-fs/src/tmp_fs.rs b/lib/vfs/src/tmp_fs.rs → lib/virtual-fs/src/tmp_fs.rs
diff --git a/lib/vfs/src/trace_fs.rs → lib/virtual-fs/src/trace_fs.rs b/lib/vfs/src/trace_fs.rs → lib/virtual-fs/src/trace_fs.rs
diff --git a/lib/vfs/src/union_fs.rs → lib/virtual-fs/src/union_fs.rs b/lib/vfs/src/union_fs.rs → lib/virtual-fs/src/union_fs.rs
diff --git a/lib/vfs/src/webc_fs.rs → lib/virtual-fs/src/webc_fs.rs b/lib/vfs/src/webc_fs.rs → lib/virtual-fs/src/webc_fs.rs
diff --git a/lib/vfs/src/webc_volume_fs.rs → lib/virtual-fs/src/webc_volume_fs.rs b/lib/vfs/src/webc_volume_fs.rs → lib/virtual-fs/src/webc_volume_fs.rs
diff --git a/lib/vfs/src/zero_file.rs → lib/virtual-fs/src/zero_file.rs b/lib/vfs/src/zero_file.rs → lib/virtual-fs/src/zero_file.rs
diff --git a/lib/vnet/Cargo.toml → lib/virtual-net/Cargo.toml b/lib/vnet/Cargo.toml → lib/virtual-net/Cargo.toml
diff --git a/lib/vnet/src/host.rs → lib/virtual-net/src/host.rs b/lib/vnet/src/host.rs → lib/virtual-net/src/host.rs
diff --git a/lib/vnet/src/lib.rs → lib/virtual-net/src/lib.rs b/lib/vnet/src/lib.rs → lib/virtual-net/src/lib.rs
diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml
@@ -18,8 +18,8 @@ getrandom = "0.2"
 wasmer-wasix-types = { path = "../wasi-types", version = "0.4.0", features = [ "enable-serde" ] }
 wasmer-types = { path = "../types", version = "=3.3.0", default-features = false }
 wasmer = { path = "../api", version = "=3.3.0", default-features = false, features = ["wat", "js-serializable-module"] }
-virtual-fs = { path = "../vfs", version = "0.2.0", default-features = false, features = ["webc-fs"] }
-virtual-net = { path = "../vnet", version = "0.1.0", default-features = false }
+virtual-fs = { path = "../virtual-fs", version = "0.2.0", default-features = false, features = ["webc-fs"] }
+virtual-net = { path = "../virtual-net", version = "0.1.0", default-features = false }
 wasmer-emscripten = { path = "../emscripten", version = "=3.3.0", optional = true }
 typetag = { version = "0.1", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }

diff --git a/tests/lib/wast/Cargo.toml b/tests/lib/wast/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 anyhow = "1.0"
 wasmer = { path = "../../../lib/api", version = "=3.3.0", default-features = false }
 wasmer-wasix = { path = "../../../lib/wasi", version = "0.4.0" }
-virtual-fs = { path = "../../../lib/vfs", version = "0.2.0" }
+virtual-fs = { path = "../../../lib/virtual-fs", version = "0.2.0" }
 wast = "38.0"
 serde = "1"
 tempfile = "3.4.0"