Update wit-bindgen and bump to 0.13.0

.github/workflows/main.yml

@@ -53,6 +53,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install Rust
       run: rustup update stable && rustup default stable
-    - run: cargo install wit-bindgen-cli@0.20.0 --locked
+    - run: cargo install wit-bindgen-cli@0.21.0 --locked
     - run: ./ci/regenerate.sh
     - run: git diff --exit-code

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasi"
-version = "0.12.1+wasi-0.2.0"
+version = "0.13.0+wasi-0.2.0"
 authors = ["The Cranelift Project Developers"]
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 description = "WASI API bindings for Rust"
@@ -12,7 +12,8 @@ readme = "README.md"
 documentation = "https://docs.rs/wasi"
 
 [dependencies]
-wit-bindgen = { version = "0.20.0", default-features = false, features = ['realloc'] }
+wit-bindgen-rt = "0.21.0"
+bitflags = "2.4.2"
 
 # When built as part of libstd
 compiler_builtins = { version = "0.1", optional = true }

ci/regenerate.sh

@@ -5,17 +5,9 @@ set -ex
 generate() {
   file="$1"
   shift
-  wit-bindgen rust wit --out-dir src --std-feature "$@"
-
-  # rustfmt chokes on the raw output of wit-bindgen right now due to trailling
-  # whitespace (unsure as to why), so format it with some options first to get it
-  # into a better state before applying the final format with default options
-  # which gets this to succeed.
-  #
-  # NB: this should be considered a bug in wit-bindgen that this is required to do
-  # twice. Passing `--rustfmt` to `wit-bindgen` should work.
-  rustfmt $file --edition 2021 --config-path ./ci/rustfmt-bindings.toml
-  rustfmt $file --edition 2021
+  wit-bindgen rust wit --out-dir src --std-feature "$@" --rustfmt \
+    --bitflags-path bitflags \
+    --runtime-path wit_bindgen_rt
 }
 
 # Generate the main body of the bindings which includes all imports from the two