Merge branch 'main' of github.com:bytecodealliance/wit-bindgen into w…

…asmfx-merge

Cargo.toml

@@ -18,7 +18,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.21.0"
+version = "0.22.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.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 }
+wit-bindgen-core = { path = 'crates/core', version = '0.22.0' }
+wit-bindgen-c = { path = 'crates/c', version = '0.22.0' }
+wit-bindgen-rust = { path = "crates/rust", version = "0.22.0" }
+wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.22.0' }
+wit-bindgen-go = { path = 'crates/go', version = '0.22.0' }
+wit-bindgen-csharp = { path = 'crates/csharp', version = '0.22.0' }
+wit-bindgen-markdown = { path = 'crates/markdown', version = '0.22.0' }
+wit-bindgen = { path = 'crates/guest-rust', version = '0.22.0', default-features = false }
 
 [[bin]]
 name = "wit-bindgen"

crates/guest-rust/Cargo.toml

@@ -12,8 +12,8 @@ Used when compiling Rust programs to the component model.
 """
 
 [dependencies]
-wit-bindgen-rust-macro = { path = "./macro", optional = true, version = "0.21.0" }
-wit-bindgen-rt = { path = "./rt", optional = true, version = "0.21.0" }
+wit-bindgen-rust-macro = { path = "./macro", optional = true, version = "0.22.0" }
+wit-bindgen-rt = { path = "./rt", optional = true, version = "0.22.0" }
 bitflags = { workspace = true }
 
 [features]

crates/guest-rust/rt/src/cabi_realloc.c

@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-extern void *cabi_realloc_wit_bindgen_0_21_0(void *ptr, size_t old_size, size_t align, size_t new_size);
+extern void *cabi_realloc_wit_bindgen_0_22_0(void *ptr, size_t old_size, size_t align, size_t new_size);
 
 __attribute__((__weak__, __export_name__("cabi_realloc")))
 void *cabi_realloc(void *ptr, size_t old_size, size_t align, size_t new_size) {
-  return cabi_realloc_wit_bindgen_0_21_0(ptr, old_size, align, new_size);
+  return cabi_realloc_wit_bindgen_0_22_0(ptr, old_size, align, new_size);
 }

crates/guest-rust/rt/src/cabi_realloc.rs

@@ -1,7 +1,7 @@
 // This file is generated by ./ci/rebuild-libcabi-realloc.sh
 
 #[no_mangle]
-pub unsafe extern "C" fn cabi_realloc_wit_bindgen_0_21_0(
+pub unsafe extern "C" fn cabi_realloc_wit_bindgen_0_22_0(
     old_ptr: *mut u8,
     old_len: usize,
     align: usize,

crates/rust/src/lib.rs

@@ -1357,7 +1357,7 @@ fn perform_cast(operand: &str, cast: &Bitcast) -> String {
         // Convert a `MaybeUninit<u64>` holding a pointer value back into
         // the pointer value.
         Bitcast::P64ToP => {
-            format!("{}.as_mut_ptr().cast::<*mut u8>().read()", operand)
+            format!("{}.as_ptr().cast::<*mut u8>().read()", operand)
         }
         // Convert an `i32` or a `usize` into a pointer.
         Bitcast::I32ToP | Bitcast::LToP => {

tests/codegen/variants-unioning-types.wit

@@ -92,4 +92,10 @@ world a {
     b(f32),
   }
   import f-s64-f32: func(x: v-s64-f32);
+
+  variant v-string-u64 {
+    a(string),
+    b(u64),
+  }
+  export f-string-u64: func(x: v-string-u64);
 }