Merge pull request #3 from wasmfx/wasmfx-merge

Merge with upstream

Author: dhil

.github/workflows/main.yml

@@ -137,6 +137,12 @@ jobs:
     - run: cargo build --no-default-features --features csharp
     - run: cargo build --no-default-features --features markdown
 
+    # Feature combos of the `wit-bindgen` crate
+    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features
+    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features realloc
+    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features macros
+    - run: cargo build --target wasm32-wasi -p wit-bindgen --no-default-features --features macros,realloc
+
     # Verity that documentation can be generated for the rust bindings crate.
     - run: cargo doc -p wit-bindgen --no-deps
       env:

Cargo.lock

@@ -18,7 +18,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.20.0"
+version = "0.21.0"
 
 [workspace.dependencies]
 anyhow = "1.0.72"
@@ -35,14 +35,14 @@ wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "wasmfx-
 wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "wasmfx-tools-1.201.0+rev.1" }
 wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "wasmfx-tools-1.201.0+rev.1" }
 
-wit-bindgen-core = { path = 'crates/core', version = '0.20.0' }
-wit-bindgen-c = { path = 'crates/c', version = '0.20.0' }
-wit-bindgen-rust = { path = "crates/rust", version = "0.20.0" }
-wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.20.0' }
-wit-bindgen-go = { path = 'crates/go', version = '0.20.0' }
-wit-bindgen-csharp = { path = 'crates/csharp', version = '0.20.0' }
-wit-bindgen-markdown = { path = 'crates/markdown', version = '0.20.0' }
-wit-bindgen = { path = 'crates/guest-rust', version = '0.20.0', default-features = false }
+wit-bindgen-core = { path = 'crates/core', version = '0.21.0' }
+wit-bindgen-c = { path = 'crates/c', version = '0.21.0' }
+wit-bindgen-rust = { path = "crates/rust", version = "0.21.0" }
+wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.21.0' }
+wit-bindgen-go = { path = 'crates/go', version = '0.21.0' }
+wit-bindgen-csharp = { path = 'crates/csharp', version = '0.21.0' }
+wit-bindgen-markdown = { path = 'crates/markdown', version = '0.21.0' }
+wit-bindgen = { path = 'crates/guest-rust', version = '0.21.0', default-features = false }
 
 [[bin]]
 name = "wit-bindgen"

Cargo.toml

@@ -25,6 +25,7 @@ const CRATES_TO_PUBLISH: &[&str] = &[
     "wit-bindgen-teavm-java",
     "wit-bindgen-markdown",
     "wit-bindgen-rust-macro",
+    "wit-bindgen-rt",
     "wit-bindgen",
     "wit-bindgen-cli",
 ];

ci/publish.rs

@@ -43,7 +43,7 @@ version=$(grep '^version =' ./Cargo.toml | sed 's/.*"\(.*\)"/\1/' | sed 's/\./_/
 
 sym=cabi_realloc_wit_bindgen_$version
 
-cat >./crates/guest-rust/src/cabi_realloc.rs <<-EOF
+cat >./crates/guest-rust/rt/src/cabi_realloc.rs <<-EOF
 // This file is generated by $0
 
 #[no_mangle]
@@ -53,11 +53,11 @@ pub unsafe extern "C" fn $sym(
     align: usize,
     new_len: usize,
 ) -> *mut u8 {
-    crate::rt::cabi_realloc(old_ptr, old_len, align, new_len)
+    crate::cabi_realloc(old_ptr, old_len, align, new_len)
 }
 EOF
 
-cat >./crates/guest-rust/src/cabi_realloc.c <<-EOF
+cat >./crates/guest-rust/rt/src/cabi_realloc.c <<-EOF
 // This file is generated by $0
 
 #include <stdint.h>
@@ -70,16 +70,16 @@ void *cabi_realloc(void *ptr, size_t old_size, size_t align, size_t new_size) {
 }
 EOF
 
-rm -f crates/guest-rust/src/cabi_realloc.o
-$WASI_SDK_PATH/bin/clang crates/guest-rust/src/cabi_realloc.c \
-  -O -c -o crates/guest-rust/src/cabi_realloc.o
+rm -f crates/guest-rust/rt/src/cabi_realloc.o
+$WASI_SDK_PATH/bin/clang crates/guest-rust/rt/src/cabi_realloc.c \
+  -O -c -o crates/guest-rust/rt/src/cabi_realloc.o
 
 # Remove the `producers` section. This appears to differ whether the host for
 # clang is either macOS or Linux. Not needed here anyway, so discard it to help
 # either host produce the same object.
-wasm-tools strip -d producers ./crates/guest-rust/src/cabi_realloc.o \
-  -o ./crates/guest-rust/src/cabi_realloc.o
+wasm-tools strip -d producers ./crates/guest-rust/rt/src/cabi_realloc.o \
+  -o ./crates/guest-rust/rt/src/cabi_realloc.o
 
-rm -f crates/guest-rust/src/libwit_bindgen_cabi_realloc.a
-$WASI_SDK_PATH/bin/llvm-ar crus crates/guest-rust/src/libwit_bindgen_cabi_realloc.a \
-  crates/guest-rust/src/cabi_realloc.o
+rm -f crates/guest-rust/rt/src/libwit_bindgen_cabi_realloc.a
+$WASI_SDK_PATH/bin/llvm-ar crus crates/guest-rust/rt/src/libwit_bindgen_cabi_realloc.a \
+  crates/guest-rust/rt/src/cabi_realloc.o