Merge pull request #16 from dhil/wasmfx-merge

Merge with upstream

Author: dhil

Cargo.lock

@@ -30,11 +30,11 @@ indexmap = "2.0.0"
 prettyplease = "0.2.20"
 syn = { version = "2.0", features = ["printing"] }
 
-wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.209.0" }
-wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.209.0" }
-wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.209.0" }
-wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.209.0" }
-wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.209.0" }
+wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.211.1" }
+wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.211.1" }
+wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.211.1" }
+wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.211.1" }
+wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.211.1" }
 
 wit-bindgen-core = { path = 'crates/core', version = '0.26.0' }
 wit-bindgen-c = { path = 'crates/c', version = '0.26.0' }
@@ -81,8 +81,8 @@ csharp-mono = ['csharp']
 
 [dev-dependencies]
 heck = { workspace = true }
-wasmtime = { version = "20.0.0", features = ['component-model'] }
-wasmtime-wasi =  { version = "20.0.0" }
+wasmtime = { version = "21.0.0", features = ['component-model'] }
+wasmtime-wasi =  { version = "21.0.0" }
 test-artifacts = { path = 'crates/test-rust-wasm/artifacts' }
 wit-parser = { workspace = true }
 wasmparser = { workspace = true }

Cargo.toml

@@ -176,7 +176,7 @@ impl WorldGenerator for C {
         name: &WorldKey,
         id: InterfaceId,
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let wasm_import_module = resolve.name_world_key(name);
         let mut gen = self.interface(resolve, true, Some(&wasm_import_module));
         gen.interface = Some((id, name));
@@ -192,6 +192,8 @@ impl WorldGenerator for C {
         }
 
         gen.gen.src.append(&gen.src);
+
+        Ok(())
     }
 
     fn import_funcs(

crates/c/src/lib.rs

@@ -3,7 +3,7 @@ use heck::*;
 use std::env;
 use std::path::{Path, PathBuf};
 use std::process::Command;
-use wit_parser::{Resolve, UnresolvedPackage};
+use wit_parser::{Resolve, UnresolvedPackageGroup};
 
 macro_rules! codegen_test {
     ($id:ident $name:tt $test:tt) => {
@@ -94,8 +94,8 @@ fn rename_option() -> Result<()> {
     opts.rename.push(("c".to_string(), "rename3".to_string()));
 
     let mut resolve = Resolve::default();
-    let pkg = resolve.push(UnresolvedPackage::parse(
-        "input.wit".as_ref(),
+    let pkgs = resolve.push_group(UnresolvedPackageGroup::parse(
+        "input.wit",
         r#"
             package foo:bar;
 
@@ -118,7 +118,7 @@ fn rename_option() -> Result<()> {
             }
         "#,
     )?)?;
-    let world = resolve.select_world(pkg, None)?;
+    let world = resolve.select_world(&pkgs, None)?;
     let mut files = Default::default();
     opts.build().generate(&resolve, world, &mut files)?;
     for (file, contents) in files.iter() {

crates/c/tests/codegen.rs

@@ -37,7 +37,9 @@ pub trait WorldGenerator {
         for (name, import) in world.imports.iter() {
             match import {
                 WorldItem::Function(f) => funcs.push((unwrap_name(name), f)),
-                WorldItem::Interface { id, .. } => self.import_interface(resolve, name, *id, files),
+                WorldItem::Interface { id, .. } => {
+                    self.import_interface(resolve, name, *id, files)?
+                }
                 WorldItem::Type(id) => types.push((unwrap_name(name), *id)),
             }
         }
@@ -91,7 +93,7 @@ pub trait WorldGenerator {
         name: &WorldKey,
         iface: InterfaceId,
         files: &mut Files,
-    );
+    ) -> Result<()>;
 
     /// Called before any exported interfaces are generated.
     fn pre_export_interface(&mut self, resolve: &Resolve, files: &mut Files) -> Result<()> {

crates/core/src/lib.rs

@@ -22,10 +22,10 @@ internal int Add(T v) {
         if (firstVacant.HasValue) {
             rep = firstVacant.Value;
             firstVacant = ((Vacant) list[rep]).next;
-            list[rep] = v;
+            list[rep] = v!;
         } else {
             rep = list.Count;
-            list.Add(v);
+            list.Add(v!);
         }
         return rep;
     }