Upgrade to wasm-tools 220 release (bytecodealliance#1084)

pchickey · web-flow · commit ae0545bb227c · 2024-11-13T06:21:52.000Z
* upgrade to wasm-tools 220 release

* guest-rust macro: minor fix for PackageSourceMap interface change
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,11 +32,11 @@ indexmap = "2.0.0"
 prettyplease = "0.2.20"
 syn = { version = "2.0", features = ["printing"] }
 
-wasmparser = "0.219.0"
-wasm-encoder = "0.219.0"
-wasm-metadata = "0.219.0"
-wit-parser = "0.219.0"
-wit-component = "0.219.0"
+wasmparser = "0.220.0"
+wasm-encoder = "0.220.0"
+wasm-metadata = "0.220.0"
+wit-parser = "0.220.0"
+wit-component = "0.220.0"
 
 wit-bindgen-core = { path = 'crates/core', version = '0.34.0' }
 wit-bindgen-c = { path = 'crates/c', version = '0.34.0' }
diff --git a/crates/guest-rust/macro/src/lib.rs b/crates/guest-rust/macro/src/lib.rs
@@ -222,7 +222,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(())
     };

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ fn parse_source(`
`222`	`222`	`};`
`223`	`223`	`let (pkg, sources) = resolve.push_path(normalized_path)?;`
`224`	`224`	`pkgs.push(pkg);`
`225`		`- files.extend(sources);`
	`225`	`+ files.extend(sources.paths().map(\|p\| p.to_owned()));`
`226`	`226`	`}`
`227`	`227`	`Ok(())`
`228`	`228`	`};`