merge: wit-bindgen 0.35

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
bytecodealliance · Nov 27, 2024 · 453e479 · 453e479
2 parents c4dfad0 + af2d6e8
commit 453e479
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -164,13 +164,13 @@ 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.35", default-features = false }
-wit-bindgen-core = { version = "0.34", default-features = false }
+wit-bindgen-core = { version = "0.35", 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.220", default-features = false }
-wit-parser = { version = "0.219", default-features = false }
+wit-parser = { version = "0.220", 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/wit-bindgen-rust-macro/src/lib.rs b/crates/wit-bindgen-rust-macro/src/lib.rs
@@ -217,7 +217,7 @@ fn parse_source(
             };
             let (pkg, sources) = resolve.push_path(normalized_path)?;
             pkgs.push(pkg);
-            files.extend(sources);
+            files.extend(sources.paths().map(|p| p.to_owned()));
         }
         Ok(())
     };