Update dependencies on major version tracks

Notably update wasm-tools deps and `syn` to its 3.x.y track.

Author: alexcrichton

Cargo.lock

@@ -42,18 +42,18 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1" }
 clap = { version = "4.6.1", features = ["derive"] }
 indexmap = "2.0.0"
-prettyplease = "0.2.20"
-syn = { version = "2.0.89", features = ["printing"] }
+prettyplease = "0.3.0"
+syn = { version = "3.0.5", features = ["printing"] }
 futures = "0.3.31"
-macro-string = "0.2.0"
+macro-string = "0.3.0"
 
-wat = "1.258.0"
-wasmparser = "0.258.0"
-wasm-encoder = "0.258.0"
-wasm-metadata = { version = "0.258.0", default-features = false }
-wit-parser = "0.258.0"
-wit-component = "0.258.0"
-wasm-compose = "0.258.0"
+wat = "1.259.0"
+wasmparser = "0.259.0"
+wasm-encoder = "0.259.0"
+wasm-metadata = { version = "0.259.0", default-features = false }
+wit-parser = "0.259.0"
+wit-component = "0.259.0"
+wasm-compose = "0.259.0"
 
 wit-bindgen-core = { path = 'crates/core', version = '0.61.1' }
 wit-bindgen-c = { path = 'crates/c', version = '0.61.1' }

Cargo.toml

@@ -179,7 +179,7 @@ impl WorldGenerator for C {
             .rename_world
             .clone()
             .unwrap_or_else(|| resolve.worlds[world].name.clone());
-        self.sizes.fill(resolve);
+        self.sizes.fill(resolve)?;
         self.world_id = Some(world);
 
         let mut interfaces = HashMap::new();
@@ -239,7 +239,7 @@ impl WorldGenerator for C {
         world: WorldId,
         funcs: &[(&str, &Function)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let name = &resolve.worlds[world].name;
         let mut r#gen = self.interface(resolve, true, Some("$root"));
         r#gen.define_function_types(funcs);
@@ -253,6 +253,7 @@ impl WorldGenerator for C {
         }
 
         r#gen.r#gen.src.append(&r#gen.src);
+        Ok(())
     }
 
     fn export_interface(
@@ -308,14 +309,15 @@ impl WorldGenerator for C {
         _world: WorldId,
         types: &[(&str, TypeId)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let mut r#gen = self.interface(resolve, true, Some("$root"));
         let mut live = LiveTypes::default();
         for (_, id) in types {
             live.add_type_id(resolve, *id);
         }
         r#gen.define_live_types(live);
         r#gen.r#gen.src.append(&r#gen.src);
+        Ok(())
     }
 
     fn finish(&mut self, resolve: &Resolve, id: WorldId, files: &mut Files) -> Result<()> {

crates/c/src/lib.rs

@@ -51,14 +51,14 @@ pub trait WorldGenerator {
             }
         }
         if !types.is_empty() {
-            self.import_types(resolve, id, &types, files);
+            self.import_types(resolve, id, &types, files)?;
         }
         if !funcs.is_empty() {
-            self.import_funcs(resolve, id, &funcs, files);
+            self.import_funcs(resolve, id, &funcs, files)?;
         }
         funcs.clear();
 
-        self.finish_imports(resolve, id, files);
+        self.finish_imports(resolve, id, files)?;
 
         // First generate bindings for any freestanding functions, if any. If
         // these refer to types defined in the world they need to refer to the
@@ -93,8 +93,14 @@ pub trait WorldGenerator {
         true
     }
 
-    fn finish_imports(&mut self, resolve: &Resolve, world: WorldId, files: &mut Files) {
+    fn finish_imports(
+        &mut self,
+        resolve: &Resolve,
+        world: WorldId,
+        files: &mut Files,
+    ) -> Result<()> {
         let _ = (resolve, world, files);
+        Ok(())
     }
 
     fn preprocess(&mut self, resolve: &Resolve, world: WorldId) -> Result<()> {
@@ -129,7 +135,7 @@ pub trait WorldGenerator {
         world: WorldId,
         funcs: &[(&str, &Function)],
         files: &mut Files,
-    );
+    ) -> Result<()>;
     fn export_funcs(
         &mut self,
         resolve: &Resolve,
@@ -143,7 +149,7 @@ pub trait WorldGenerator {
         world: WorldId,
         types: &[(&str, TypeId)],
         files: &mut Files,
-    );
+    ) -> Result<()>;
     fn finish(&mut self, resolve: &Resolve, world: WorldId, files: &mut Files) -> Result<()>;
 }
 

crates/core/src/lib.rs

@@ -1,4 +1,4 @@
-use anyhow::bail;
+use anyhow::{Result, bail};
 use heck::{ToPascalCase, ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
 use indexmap::{IndexMap, IndexSet};
 use std::{
@@ -331,11 +331,11 @@ impl Cpp {
         name: Option<&'a WorldKey>,
         in_guest_import: bool,
         wasm_import_module: Option<String>,
-    ) -> CppInterfaceGenerator<'a> {
+    ) -> Result<CppInterfaceGenerator<'a>> {
         let mut sizes = SizeAlign::default();
-        sizes.fill(resolve);
+        sizes.fill(resolve)?;
 
-        CppInterfaceGenerator {
+        Ok(CppInterfaceGenerator {
             _src: Source::default(),
             r#gen: self,
             resolve,
@@ -344,7 +344,7 @@ impl Cpp {
             sizes,
             in_guest_import,
             wasm_import_module,
-        }
+        })
     }
 
     fn clang_format(code: &mut String) {
@@ -549,7 +549,7 @@ impl WorldGenerator for Cpp {
                 let store = self.start_new_file(None);
                 let wasm_import_module = resolve.name_world_key(name);
                 let binding = Some(name);
-                let mut r#gen = self.interface(resolve, binding, true, Some(wasm_import_module));
+                let mut r#gen = self.interface(resolve, binding, true, Some(wasm_import_module))?;
                 r#gen.interface = Some(id);
                 let namespace = namespace(resolve, &TypeOwner::Interface(id), false, &*r#gen.r#gen);
                 let docs = resolve.interfaces[id].docs.contents.as_deref();
@@ -605,7 +605,7 @@ impl WorldGenerator for Cpp {
         self.update_instance_name(resolve, name, id);
         let wasm_import_module = resolve.name_world_key(name);
         let binding = Some(name);
-        let mut r#gen = self.interface(resolve, binding, false, Some(wasm_import_module));
+        let mut r#gen = self.interface(resolve, binding, false, Some(wasm_import_module))?;
         r#gen.interface = Some(id);
         let namespace = namespace(resolve, &TypeOwner::Interface(id), true, &*r#gen.r#gen);
         let docs = resolve.interfaces[id].docs.contents.as_deref();
@@ -632,11 +632,12 @@ impl WorldGenerator for Cpp {
         world: WorldId,
         funcs: &[(&str, &Function)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let name = WorldKey::Name("$root".to_string()); //WorldKey::Name(resolve.worlds[world].name.clone());
         let wasm_import_module = resolve.name_world_key(&name);
         let binding = Some(name);
-        let mut r#gen = self.interface(resolve, binding.as_ref(), true, Some(wasm_import_module));
+        let mut r#gen =
+            self.interface(resolve, binding.as_ref(), true, Some(wasm_import_module))?;
         let namespace = namespace(resolve, &TypeOwner::World(world), false, &*r#gen.r#gen);
 
         for (_name, func) in funcs.iter() {
@@ -645,6 +646,7 @@ impl WorldGenerator for Cpp {
                 r#gen.generate_function(func, &TypeOwner::World(world), AbiVariant::GuestImport);
             }
         }
+        Ok(())
     }
 
     fn export_funcs(
@@ -656,7 +658,7 @@ impl WorldGenerator for Cpp {
     ) -> anyhow::Result<()> {
         let name = WorldKey::Name(resolve.worlds[world].name.clone());
         let binding = Some(name);
-        let mut r#gen = self.interface(resolve, binding.as_ref(), false, None);
+        let mut r#gen = self.interface(resolve, binding.as_ref(), false, None)?;
         let namespace = namespace(resolve, &TypeOwner::World(world), true, &*r#gen.r#gen);
 
         for (_name, func) in funcs.iter() {
@@ -674,11 +676,12 @@ impl WorldGenerator for Cpp {
         _world: WorldId,
         types: &[(&str, TypeId)],
         _files: &mut Files,
-    ) {
-        let mut r#gen = self.interface(resolve, None, true, Some("$root".to_string()));
+    ) -> Result<()> {
+        let mut r#gen = self.interface(resolve, None, true, Some("$root".to_string()))?;
         for (name, id) in types.iter() {
             r#gen.define_type(name, *id);
         }
+        Ok(())
     }
 
     fn finish(

crates/cpp/src/lib.rs

@@ -2,6 +2,7 @@ use crate::csharp_ident::ToCSharpIdent;
 use crate::function::ResourceInfo;
 use crate::interface::{InterfaceFragment, InterfaceGenerator, InterfaceTypeAndFragments};
 use crate::{CSharpRuntime, Opts};
+use anyhow::Result;
 use heck::ToUpperCamelCase;
 use indexmap::IndexMap;
 use std::collections::{HashMap, HashSet};
@@ -170,7 +171,7 @@ impl WorldGenerator for CSharp {
             }
         });
         self.name = name.to_string();
-        self.sizes.fill(resolve);
+        self.sizes.fill(resolve)?;
         Ok(())
     }
 
@@ -229,7 +230,7 @@ impl WorldGenerator for CSharp {
         world: WorldId,
         funcs: &[(&str, &Function)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         self.import_funcs_called = true;
 
         let name = &format!("{}-world", resolve.worlds[world].name).to_upper_camel_case();
@@ -255,6 +256,7 @@ impl WorldGenerator for CSharp {
         }
 
         r#gen.add_world_fragment(Some(Direction::Import));
+        Ok(())
     }
 
     fn export_interface(
@@ -364,7 +366,7 @@ impl WorldGenerator for CSharp {
         world: WorldId,
         types: &[(&str, TypeId)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let name = &format!("{}-world", resolve.worlds[world].name).to_upper_camel_case();
         let name = &format!("{name}.I{name}Imports");
         let mut r#gen = self.interface(resolve, name, Direction::Import, false);
@@ -379,12 +381,13 @@ impl WorldGenerator for CSharp {
         r#gen.csharp_gen.world_resources = new_resources;
 
         r#gen.add_world_fragment(Some(Direction::Import));
+        Ok(())
     }
 
     fn finish(&mut self, resolve: &Resolve, id: WorldId, files: &mut Files) -> anyhow::Result<()> {
         if !self.import_funcs_called {
             // Ensure that we emit type declarations for any top-level imported resource types:
-            self.import_funcs(resolve, id, &[], files);
+            self.import_funcs(resolve, id, &[], files)?;
         }
 
         let world = &resolve.worlds[id];

crates/csharp/src/world_generator.rs

@@ -341,11 +341,11 @@ impl D {
         direction: Option<Direction>,
         name: Option<&'a WorldKey>,
         wasm_import_module: Option<&'a str>,
-    ) -> DInterfaceGenerator<'a> {
+    ) -> Result<DInterfaceGenerator<'a>> {
         let mut sizes = SizeAlign::default();
-        sizes.fill(resolve);
+        sizes.fill(resolve)?;
 
-        DInterfaceGenerator {
+        Ok(DInterfaceGenerator {
             src: Source::default(),
             stub_src: Source::default(),
             stubs: Vec::default(),
@@ -361,7 +361,7 @@ impl D {
 
             return_pointer_area_size: Default::default(),
             return_pointer_area_align: Default::default(),
-        }
+        })
     }
 
     fn lookup_interface_fqn(&self, id: InterfaceId, direction: Option<Direction>) -> Option<&str> {
@@ -497,7 +497,7 @@ impl WorldGenerator for D {
             Some(Direction::Import),
             Some(name),
             Some(&wasm_import_module),
-        );
+        )?;
         r#gen.fqn = &fqn;
         r#gen.interface = Some(id);
         r#gen.prologue();
@@ -545,16 +545,17 @@ impl WorldGenerator for D {
         _world: WorldId,
         types: &[(&str, TypeId)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let fqn = self.world_fqn.clone();
-        let mut r#gen = self.interface(resolve, Some(Direction::Import), None, Some("$root"));
+        let mut r#gen = self.interface(resolve, Some(Direction::Import), None, Some("$root"))?;
         r#gen.fqn = &fqn;
 
         for (name, id) in types.iter() {
             r#gen.define_type(name, *id);
         }
 
         self.type_imports_src = take(&mut r#gen.src);
+        Ok(())
     }
 
     fn import_funcs(
@@ -563,16 +564,17 @@ impl WorldGenerator for D {
         _world: WorldId,
         funcs: &[(&str, &Function)],
         _files: &mut Files,
-    ) {
+    ) -> Result<()> {
         let fqn = self.world_fqn.clone();
-        let mut r#gen = self.interface(resolve, Some(Direction::Import), None, Some("$root"));
+        let mut r#gen = self.interface(resolve, Some(Direction::Import), None, Some("$root"))?;
         r#gen.fqn = &fqn;
 
         for (_name, func) in funcs {
             r#gen.import_func(func);
         }
 
         self.function_imports_src = take(&mut r#gen.src);
+        Ok(())
     }
 
     fn export_interface(
@@ -598,7 +600,7 @@ impl WorldGenerator for D {
             Some(Direction::Export),
             Some(name),
             Some(&wasm_import_module),
-        );
+        )?;
         r#gen.fqn = &fqn;
         r#gen.interface = Some(id);
         r#gen.prologue();
@@ -749,7 +751,7 @@ impl WorldGenerator for D {
         _files: &mut Files,
     ) -> Result<()> {
         let fqn = self.world_fqn.clone();
-        let mut r#gen = self.interface(resolve, Some(Direction::Export), None, Some("$root"));
+        let mut r#gen = self.interface(resolve, Some(Direction::Export), None, Some("$root"))?;
         r#gen.fqn = &fqn;
 
         for (_name, func) in funcs {
@@ -788,7 +790,7 @@ impl WorldGenerator for D {
 
                 let wasm_import_module = resolve.name_world_key(&name);
                 let mut r#gen =
-                    self.interface(resolve, None, Some(&name), Some(&wasm_import_module));
+                    self.interface(resolve, None, Some(&name), Some(&wasm_import_module))?;
                 r#gen.fqn = &fqn;
                 r#gen.interface = Some(id);
                 r#gen.prologue();