update WASI submodule (#3025)

* wasi-common: update wasi submodule

This updates the WASI submodule, pulling in changes to the witx crate,
now that there is a 0.9.1 version including some bug fixes. See
WebAssembly/WASI#434 for more information.

* wiggle: update witx dependencies

* publish: verify and vendor witx-cli

* adjust root workspace members

This commit removes some items from the root manifest's workspace
members array, and adds `witx-cli` to the root `workspace.exclude`
array.

The motivation for this stems from a cargo bug described in
rust-lang/cargo#6745: `workspace.exclude` does not work if it is nested
under a `workspace.members` path.

See WebAssembly/WASI#438 for the underlying change to the WASI submodule
which reorganized the `witx-cli` crate, and WebAssembly/WASI#398 for the
original PR introducing `witx-cli`.

See [this
comment](https://github.com/bytecodealliance/wasmtime/pull/3025#issuecomment-867741175)
for more details about the compilation errors, and failed alternative
approaches that necessitated this change.

N.B. This is not a functional change, these crates are still implicitly
workspace members as transitive dependencies, but this will allow us to
side-step the aforementioned cargo bug.

Co-Authored-By: Alex Crichton <alex@alexcrichton.com>

Co-authored-by: Alex Crichton <alex@alexcrichton.com>

Cargo.lock

@@ -986,12 +986,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
-
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -3855,9 +3849,9 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "33.0.0"
+version = "35.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d04fe175c7f78214971293e7d8875673804e736092206a3a4544dbc12811c1b"
+checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68"
 dependencies = [
  "leb128",
 ]
@@ -3986,16 +3980,13 @@ dependencies = [
 
 [[package]]
 name = "witx"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "anyhow",
- "diff",
  "log",
- "pretty_env_logger",
  "rayon",
- "structopt",
  "thiserror",
- "wast 33.0.0",
+ "wast 35.0.2",
 ]
 
 [[package]]

Cargo.toml

@@ -73,19 +73,13 @@ members = [
   "cranelift",
   "crates/bench-api",
   "crates/c-api",
-  "crates/fuzzing",
   "crates/misc/run-examples",
-  "crates/wiggle",
-  "crates/wiggle/generate",
-  "crates/wiggle/macro",
-  "crates/wasi-common",
-  "crates/wasi-common/cap-std-sync",
-  "crates/wasi-common/tokio",
   "examples/fib-debug/wasm",
   "examples/wasi/wasm",
   "examples/tokio/wasm",
   "fuzz",
 ]
+exclude = ['crates/wasi-common/WASI/tools/witx-cli']
 
 [features]
 default = ["jitdump", "wasmtime/wat", "wasmtime/parallel-compilation", "wasi-nn"]

crates/wiggle/Cargo.toml

@@ -12,7 +12,7 @@ include = ["src/**/*", "README.md", "LICENSE"]
 
 [dependencies]
 thiserror = "1"
-witx = { path = "../wasi-common/WASI/tools/witx", version = "0.9.0", optional = true }
+witx = { path = "../wasi-common/WASI/tools/witx", version = "0.9.1", optional = true }
 wiggle-macro = { path = "macro", version = "0.28.0" }
 tracing = "0.1.15"
 bitflags = "1.2"

crates/wiggle/generate/Cargo.toml

@@ -14,7 +14,7 @@ include = ["src/**/*", "README.md", "LICENSE"]
 [lib]
 
 [dependencies]
-witx = { version = "0.9.0", path = "../../wasi-common/WASI/tools/witx" }
+witx = { version = "0.9.1", path = "../../wasi-common/WASI/tools/witx" }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.3"

crates/wiggle/macro/Cargo.toml

@@ -22,7 +22,7 @@ doctest = false
 
 [dependencies]
 wiggle-generate = { path = "../generate", version = "0.28.0" }
-witx = { version = "0.9.0", path = "../../wasi-common/WASI/tools/witx" }
+witx = { version = "0.9.1", path = "../../wasi-common/WASI/tools/witx" }
 quote = "1.0"
 syn = { version = "1.0", features = ["full"] }
 proc-macro2 = "1.0"

scripts/publish.rs

@@ -176,7 +176,7 @@ fn read_crate(manifest: &Path) -> Crate {
     } else {
         version.clone()
     };
-    if ["witx", "wasi-crypto"].contains(&&name[..]) {
+    if ["witx", "witx-cli", "wasi-crypto"].contains(&&name[..]) {
         publish = false;
     }
     Crate {