Update to the latest wit-bindgen (#113)

* Update to the latest `wit-bindgen`

* Minor preparations for hopeful inclusion into libstd
* Reexport the new `bitflags` feature

* Update `link_section` outputs in generated code

Closes #112

* Update to crates.io-based versions

* Regenerate files with 0.45.0

Author: alexcrichton

.github/workflows/main.yml

@@ -72,6 +72,6 @@ jobs:
       run: |
         ./ci/vendor-wit.sh
         git diff --exit-code
-    - run: cargo install wit-bindgen-cli@0.39.0 --locked
+    - run: cargo install wit-bindgen-cli@0.45.0 --locked
     - run: ./ci/regenerate.sh
     - run: git diff --exit-code

Cargo.toml

@@ -24,17 +24,18 @@ wasi = { version = "0.14", path = ".", default-features = false }
 members = ["./crates/*"]
 
 [dependencies]
-wit-bindgen-rt = { version = "0.39.0", features = ["bitflags"] }
+wit-bindgen = { version = "0.45.0", default-features = false }
 
 # When built as part of libstd
 core = { version = "1.0", optional = true, package = "rustc-std-workspace-core" }
-rustc-std-workspace-alloc = { version = "1.0", optional = true }
+alloc = { version = "1.0", optional = true, package = "rustc-std-workspace-alloc" }
 
 [features]
-default = ["std"]
+default = ["std", "bitflags"]
 std = []
+bitflags = ["wit-bindgen/bitflags"]
 # Unstable feature to support being a libstd dependency
-rustc-dep-of-std = ["core", "rustc-std-workspace-alloc"]
+rustc-dep-of-std = ["core", "alloc", "wit-bindgen/rustc-dep-of-std"]
 
 [[example]]
 name = "cli-command-no_std"

ci/regenerate.sh

@@ -5,8 +5,12 @@ set -ex
 generate() {
   file="$1"
   shift
-  wit-bindgen rust wit --async none --out-dir src --std-feature "$@" --format \
-    --runtime-path wit_bindgen_rt
+  wit-bindgen rust wit --out-dir src --std-feature "$@" --format
+
+  sed -z -i 's/#\[unsafe(\n    link_section = "\(.*\)"\n)\]/\
+#[cfg_attr(feature = "rustc-dep-of-std", unsafe(link_section = "\1-in-libstd"))]\
+#[cfg_attr(not(feature = "rustc-dep-of-std"), unsafe(link_section = "\1"))]\
+/' $file
 }
 
 # Generate the main body of the bindings which includes all imports from the two