From 47fec44c10a387448574f756cf783cea4106dbdd Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Thu, 28 Jan 2021 15:15:50 -0800 Subject: [PATCH] move wasi-c2 into wasi-common --- crates/wasi-c2/build.rs | 10 ---------- crates/{wasi-c2 => wasi-common}/Cargo.toml | 0 crates/wasi-common/build.rs | 4 +++- .../{wasi-c2 => wasi-common}/cap-std-sync/Cargo.toml | 0 .../cap-std-sync/src/clocks.rs | 0 .../{wasi-c2 => wasi-common}/cap-std-sync/src/dir.rs | 0 .../{wasi-c2 => wasi-common}/cap-std-sync/src/file.rs | 0 .../{wasi-c2 => wasi-common}/cap-std-sync/src/lib.rs | 0 .../{wasi-c2 => wasi-common}/cap-std-sync/src/sched.rs | 0 .../cap-std-sync/src/sched/unix.rs | 0 .../cap-std-sync/src/sched/windows.rs | 0 .../{wasi-c2 => wasi-common}/cap-std-sync/src/stdio.rs | 0 crates/{wasi-c2 => wasi-common}/src/clocks.rs | 0 crates/{wasi-c2 => wasi-common}/src/ctx.rs | 0 crates/{wasi-c2 => wasi-common}/src/dir.rs | 0 crates/{wasi-c2 => wasi-common}/src/error.rs | 0 crates/{wasi-c2 => wasi-common}/src/file.rs | 0 crates/{wasi-c2 => wasi-common}/src/lib.rs | 0 crates/{wasi-c2 => wasi-common}/src/pipe.rs | 0 crates/{wasi-c2 => wasi-common}/src/random.rs | 0 crates/{wasi-c2 => wasi-common}/src/sched.rs | 0 .../{wasi-c2 => wasi-common}/src/sched/subscription.rs | 0 crates/{wasi-c2 => wasi-common}/src/snapshots/mod.rs | 0 .../src/snapshots/preview_1.rs | 0 crates/{wasi-c2 => wasi-common}/src/string_array.rs | 0 crates/{wasi-c2 => wasi-common}/src/table.rs | 0 crates/{wasi-c2 => wasi-common}/wasmtime/Cargo.toml | 0 crates/{wasi-c2 => wasi-common}/wasmtime/build.rs | 0 crates/{wasi-c2 => wasi-common}/wasmtime/src/lib.rs | 0 29 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 crates/wasi-c2/build.rs rename crates/{wasi-c2 => wasi-common}/Cargo.toml (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/Cargo.toml (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/clocks.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/dir.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/file.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/lib.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/sched.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/sched/unix.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/sched/windows.rs (100%) rename crates/{wasi-c2 => wasi-common}/cap-std-sync/src/stdio.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/clocks.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/ctx.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/dir.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/error.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/file.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/lib.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/pipe.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/random.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/sched.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/sched/subscription.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/snapshots/mod.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/snapshots/preview_1.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/string_array.rs (100%) rename crates/{wasi-c2 => wasi-common}/src/table.rs (100%) rename crates/{wasi-c2 => wasi-common}/wasmtime/Cargo.toml (100%) rename crates/{wasi-c2 => wasi-common}/wasmtime/build.rs (100%) rename crates/{wasi-c2 => wasi-common}/wasmtime/src/lib.rs (100%) diff --git a/crates/wasi-c2/build.rs b/crates/wasi-c2/build.rs deleted file mode 100644 index a83d4831ad..0000000000 --- a/crates/wasi-c2/build.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Tell any dependencies, if necessary, where our WASI submodule is so they can -// use the same witx files if they want. -fn main() { - let cwd = std::env::current_dir().unwrap(); - let wasi = cwd.join("..").join("wasi-common").join("WASI"); - // this will be available to dependent crates via the DEP_WASI_C2_19_WASI env var: - println!("cargo:wasi={}", wasi.display()); - // and available to our own crate as WASI_ROOT: - println!("cargo:rustc-env=WASI_ROOT={}", wasi.display()); -} diff --git a/crates/wasi-c2/Cargo.toml b/crates/wasi-common/Cargo.toml similarity index 100% rename from crates/wasi-c2/Cargo.toml rename to crates/wasi-common/Cargo.toml diff --git a/crates/wasi-common/build.rs b/crates/wasi-common/build.rs index 934da6e673..a83d4831ad 100644 --- a/crates/wasi-common/build.rs +++ b/crates/wasi-common/build.rs @@ -2,7 +2,9 @@ // use the same witx files if they want. fn main() { let cwd = std::env::current_dir().unwrap(); - let wasi = cwd.join("WASI"); + let wasi = cwd.join("..").join("wasi-common").join("WASI"); + // this will be available to dependent crates via the DEP_WASI_C2_19_WASI env var: println!("cargo:wasi={}", wasi.display()); + // and available to our own crate as WASI_ROOT: println!("cargo:rustc-env=WASI_ROOT={}", wasi.display()); } diff --git a/crates/wasi-c2/cap-std-sync/Cargo.toml b/crates/wasi-common/cap-std-sync/Cargo.toml similarity index 100% rename from crates/wasi-c2/cap-std-sync/Cargo.toml rename to crates/wasi-common/cap-std-sync/Cargo.toml diff --git a/crates/wasi-c2/cap-std-sync/src/clocks.rs b/crates/wasi-common/cap-std-sync/src/clocks.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/clocks.rs rename to crates/wasi-common/cap-std-sync/src/clocks.rs diff --git a/crates/wasi-c2/cap-std-sync/src/dir.rs b/crates/wasi-common/cap-std-sync/src/dir.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/dir.rs rename to crates/wasi-common/cap-std-sync/src/dir.rs diff --git a/crates/wasi-c2/cap-std-sync/src/file.rs b/crates/wasi-common/cap-std-sync/src/file.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/file.rs rename to crates/wasi-common/cap-std-sync/src/file.rs diff --git a/crates/wasi-c2/cap-std-sync/src/lib.rs b/crates/wasi-common/cap-std-sync/src/lib.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/lib.rs rename to crates/wasi-common/cap-std-sync/src/lib.rs diff --git a/crates/wasi-c2/cap-std-sync/src/sched.rs b/crates/wasi-common/cap-std-sync/src/sched.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/sched.rs rename to crates/wasi-common/cap-std-sync/src/sched.rs diff --git a/crates/wasi-c2/cap-std-sync/src/sched/unix.rs b/crates/wasi-common/cap-std-sync/src/sched/unix.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/sched/unix.rs rename to crates/wasi-common/cap-std-sync/src/sched/unix.rs diff --git a/crates/wasi-c2/cap-std-sync/src/sched/windows.rs b/crates/wasi-common/cap-std-sync/src/sched/windows.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/sched/windows.rs rename to crates/wasi-common/cap-std-sync/src/sched/windows.rs diff --git a/crates/wasi-c2/cap-std-sync/src/stdio.rs b/crates/wasi-common/cap-std-sync/src/stdio.rs similarity index 100% rename from crates/wasi-c2/cap-std-sync/src/stdio.rs rename to crates/wasi-common/cap-std-sync/src/stdio.rs diff --git a/crates/wasi-c2/src/clocks.rs b/crates/wasi-common/src/clocks.rs similarity index 100% rename from crates/wasi-c2/src/clocks.rs rename to crates/wasi-common/src/clocks.rs diff --git a/crates/wasi-c2/src/ctx.rs b/crates/wasi-common/src/ctx.rs similarity index 100% rename from crates/wasi-c2/src/ctx.rs rename to crates/wasi-common/src/ctx.rs diff --git a/crates/wasi-c2/src/dir.rs b/crates/wasi-common/src/dir.rs similarity index 100% rename from crates/wasi-c2/src/dir.rs rename to crates/wasi-common/src/dir.rs diff --git a/crates/wasi-c2/src/error.rs b/crates/wasi-common/src/error.rs similarity index 100% rename from crates/wasi-c2/src/error.rs rename to crates/wasi-common/src/error.rs diff --git a/crates/wasi-c2/src/file.rs b/crates/wasi-common/src/file.rs similarity index 100% rename from crates/wasi-c2/src/file.rs rename to crates/wasi-common/src/file.rs diff --git a/crates/wasi-c2/src/lib.rs b/crates/wasi-common/src/lib.rs similarity index 100% rename from crates/wasi-c2/src/lib.rs rename to crates/wasi-common/src/lib.rs diff --git a/crates/wasi-c2/src/pipe.rs b/crates/wasi-common/src/pipe.rs similarity index 100% rename from crates/wasi-c2/src/pipe.rs rename to crates/wasi-common/src/pipe.rs diff --git a/crates/wasi-c2/src/random.rs b/crates/wasi-common/src/random.rs similarity index 100% rename from crates/wasi-c2/src/random.rs rename to crates/wasi-common/src/random.rs diff --git a/crates/wasi-c2/src/sched.rs b/crates/wasi-common/src/sched.rs similarity index 100% rename from crates/wasi-c2/src/sched.rs rename to crates/wasi-common/src/sched.rs diff --git a/crates/wasi-c2/src/sched/subscription.rs b/crates/wasi-common/src/sched/subscription.rs similarity index 100% rename from crates/wasi-c2/src/sched/subscription.rs rename to crates/wasi-common/src/sched/subscription.rs diff --git a/crates/wasi-c2/src/snapshots/mod.rs b/crates/wasi-common/src/snapshots/mod.rs similarity index 100% rename from crates/wasi-c2/src/snapshots/mod.rs rename to crates/wasi-common/src/snapshots/mod.rs diff --git a/crates/wasi-c2/src/snapshots/preview_1.rs b/crates/wasi-common/src/snapshots/preview_1.rs similarity index 100% rename from crates/wasi-c2/src/snapshots/preview_1.rs rename to crates/wasi-common/src/snapshots/preview_1.rs diff --git a/crates/wasi-c2/src/string_array.rs b/crates/wasi-common/src/string_array.rs similarity index 100% rename from crates/wasi-c2/src/string_array.rs rename to crates/wasi-common/src/string_array.rs diff --git a/crates/wasi-c2/src/table.rs b/crates/wasi-common/src/table.rs similarity index 100% rename from crates/wasi-c2/src/table.rs rename to crates/wasi-common/src/table.rs diff --git a/crates/wasi-c2/wasmtime/Cargo.toml b/crates/wasi-common/wasmtime/Cargo.toml similarity index 100% rename from crates/wasi-c2/wasmtime/Cargo.toml rename to crates/wasi-common/wasmtime/Cargo.toml diff --git a/crates/wasi-c2/wasmtime/build.rs b/crates/wasi-common/wasmtime/build.rs similarity index 100% rename from crates/wasi-c2/wasmtime/build.rs rename to crates/wasi-common/wasmtime/build.rs diff --git a/crates/wasi-c2/wasmtime/src/lib.rs b/crates/wasi-common/wasmtime/src/lib.rs similarity index 100% rename from crates/wasi-c2/wasmtime/src/lib.rs rename to crates/wasi-common/wasmtime/src/lib.rs