merge: '[email protected]'

bytecodealliance · Jan 14, 2025 · 63876a2 · 63876a2
2 parents c5df716 + 5928056
commit 63876a2
Show file tree

Hide file tree

Showing 17 changed files with 589 additions and 255 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -161,19 +161,19 @@ uuid = { version = "1", default-features = false }
 wasi = { version = "0.13", default-features = false }
 wasi-preview1-component-adapter-provider = { version = "27", default-features = false }
 wasm-tokio = { version = "0.6", default-features = false }
-wasmparser = { version = "0.221", default-features = false }
+wasmparser = { version = "0.223", default-features = false }
 wasmtime = { version = "27", default-features = false }
 wasmtime-cli-flags = { version = "27", default-features = false }
 wasmtime-wasi = { version = "27", default-features = false }
 wasmtime-wasi-http = { version = "27", default-features = false }
-wit-bindgen = { version = "0.36", default-features = false }
-wit-bindgen-core = { version = "0.36", default-features = false }
+wit-bindgen = { version = "0.37", default-features = false }
+wit-bindgen-core = { version = "0.37", default-features = false }
 wit-bindgen-wrpc = { version = "0.9", default-features = false, path = "./crates/wit-bindgen" }
 wit-bindgen-wrpc-go = { version = "0.11", default-features = false, path = "./crates/wit-bindgen-go" }
 wit-bindgen-wrpc-rust = { version = "0.9", default-features = false, path = "./crates/wit-bindgen-rust" }
 wit-bindgen-wrpc-rust-macro = { version = "0.9", default-features = false, path = "./crates/wit-bindgen-rust-macro" }
-wit-component = { version = "0.221", default-features = false }
-wit-parser = { version = "0.220", default-features = false }
+wit-component = { version = "0.223", default-features = false }
+wit-parser = { version = "0.223", default-features = false }
 wrpc-cli = { version = "0.5", path = "./crates/cli", default-features = false }
 wrpc-introspect = { version = "0.6", default-features = false, path = "./crates/introspect" }
 wrpc-runtime-wasmtime = { version = "0.26", path = "./crates/runtime-wasmtime", default-features = false }

diff --git a/crates/introspect/src/lib.rs b/crates/introspect/src/lib.rs
@@ -1,8 +1,8 @@
 use std::collections::{BTreeSet, VecDeque};
 
 use wit_parser::{
-    Case, Field, Flags, Function, FunctionKind, Handle, Int, Record, Resolve, Stream, Type,
-    TypeDefKind, TypeId,
+    Case, Field, Flags, Function, FunctionKind, Handle, Int, Record, Resolve, Type, TypeDefKind,
+    TypeId,
 };
 
 #[must_use]
@@ -188,22 +188,21 @@ pub fn async_paths_tyid(resolve: &Resolve, id: TypeId) -> (BTreeSet<VecDeque<Opt
             }
             (paths, true)
         }
-        TypeDefKind::Stream(Stream { element, .. }) => {
+        TypeDefKind::Stream(ty) => {
             let mut paths = BTreeSet::new();
-            if let Some(ty) = element {
-                let (nested, fut) = async_paths_ty(resolve, ty);
-                for mut path in nested {
-                    path.push_front(None);
-                    paths.insert(path);
-                }
-                if fut {
-                    paths.insert(vec![None].into());
-                }
+            let (nested, fut) = async_paths_ty(resolve, ty);
+            for mut path in nested {
+                path.push_front(None);
+                paths.insert(path);
+            }
+            if fut {
+                paths.insert(vec![None].into());
             }
             (paths.into_iter().collect(), true)
         }
         TypeDefKind::Type(ty) => async_paths_ty(resolve, ty),
         TypeDefKind::Resource
+        | TypeDefKind::ErrorContext
         | TypeDefKind::Flags(..)
         | TypeDefKind::Enum(..)
         | TypeDefKind::Handle(Handle::Own(..) | Handle::Borrow(..)) => (BTreeSet::default(), false),

diff --git a/crates/test-helpers/src/lib.rs b/crates/test-helpers/src/lib.rs
@@ -31,9 +31,10 @@ pub fn test_directory(suite_name: &str, gen_name: &str, wit_name: &str) -> PathB
 /// Helper function to execute a process during tests and print informative
 /// information if it fails.
 pub fn run_command(cmd: &mut Command) {
+    let command = format!("{cmd:?}");
     let output = cmd
         .output()
-        .expect("failed to run executable; is it installed");
+        .unwrap_or_else(|e| panic!("failed to run executable: {e}; command was `{command}`"));
 
     if output.status.success() {
         return;

diff --git a/crates/transport/src/value.rs b/crates/transport/src/value.rs
@@ -1286,8 +1286,12 @@ pub trait TupleDecode<R>: Decode<R> {}
 impl<W> Encode<W> for () {
     type Encoder = UnitCodec;
 }
+impl<W> Encode<W> for &() {
+    type Encoder = UnitCodec;
+}
 
 impl<W> TupleEncode<W> for () {}
+impl<W> TupleEncode<W> for &() {}
 
 impl<R> Decode<R> for () {
     type Decoder = UnitCodec;