update workspace to 2024 edition

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

Cargo.toml

@@ -15,11 +15,11 @@ CLI tool to generate bindings for WIT documents and the component model.
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 version = "0.49.0"
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 repository = "https://github.com/bytecodealliance/wit-bindgen"
-rust-version = "1.82.0"
+rust-version = "1.85.0"
 
 [workspace.dependencies]
 anyhow = "1.0.72"

crates/c/src/lib.rs

@@ -10,8 +10,8 @@ use wit_bindgen_core::abi::{
     self, AbiVariant, Bindgen, Bitcast, Instruction, LiftLower, WasmSignature, WasmType,
 };
 use wit_bindgen_core::{
-    dealias, uwrite, uwriteln, wit_parser::*, AnonymousTypeGenerator, AsyncFilterSet, Direction,
-    Files, InterfaceGenerator as _, Ns, WorldGenerator,
+    AnonymousTypeGenerator, AsyncFilterSet, Direction, Files, InterfaceGenerator as _, Ns,
+    WorldGenerator, dealias, uwrite, uwriteln, wit_parser::*,
 };
 use wit_component::StringEncoding;
 

crates/core/src/abi.rs

@@ -3,8 +3,8 @@ use std::iter;
 
 pub use wit_parser::abi::{AbiVariant, FlatTypes, WasmSignature, WasmType};
 use wit_parser::{
-    align_to_arch, Alignment, ArchitectureSize, ElementInfo, Enum, Flags, FlagsRepr, Function,
-    Handle, Int, Record, Resolve, Result_, SizeAlign, Tuple, Type, TypeDefKind, TypeId, Variant,
+    Alignment, ArchitectureSize, ElementInfo, Enum, Flags, FlagsRepr, Function, Handle, Int,
+    Record, Resolve, Result_, SizeAlign, Tuple, Type, TypeDefKind, TypeId, Variant, align_to_arch,
 };
 
 // Helper macro for defining instructions without having to have tons of

crates/core/src/async_.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use std::collections::HashSet;
 use std::fmt;
 use wit_parser::{Function, FunctionKind, Resolve, WorldKey};

crates/core/src/source.rs

@@ -1,5 +1,5 @@
-use std::collections::btree_map::Entry;
 use std::collections::BTreeMap;
+use std::collections::btree_map::Entry;
 use std::fmt::{self, Write};
 use std::ops::Deref;
 

crates/cpp/src/lib.rs

@@ -6,7 +6,7 @@ use std::fmt::Write;
 use std::mem;
 use std::ops::Deref;
 use wit_bindgen_core::abi::{self, Bindgen, Bitcast, Instruction};
-use wit_bindgen_core::{uwrite, uwriteln, Direction, Ns};
+use wit_bindgen_core::{Direction, Ns, uwrite, uwriteln};
 use wit_parser::abi::WasmType;
 use wit_parser::{
     Alignment, ArchitectureSize, Docs, FunctionKind, Handle, Resolve, SizeAlign, Type, TypeDefKind,
@@ -385,7 +385,10 @@ impl<'a, 'b> FunctionBindgen<'a, 'b> {
         let address = self.locals.tmp("address");
         let buffer_size = self.get_size_for_type(results);
         let align = self.get_align_for_type(results);
-        uwriteln!(self.src, "void* {address} = global::System.Runtime.InteropServices.NativeMemory.AlignedAlloc({buffer_size}, {align});");
+        uwriteln!(
+            self.src,
+            "void* {address} = global::System.Runtime.InteropServices.NativeMemory.AlignedAlloc({buffer_size}, {align});"
+        );
 
         // TODO: Store the address somewhere so we can free it when the task completes.
         address

crates/csharp/src/function.rs

@@ -8,7 +8,7 @@ use std::fmt::Write;
 use std::ops::Deref;
 use wit_bindgen_core::abi::LiftLower;
 use wit_bindgen_core::{
-    abi, uwrite, uwriteln, Direction, InterfaceGenerator as CoreInterfaceGenerator,
+    Direction, InterfaceGenerator as CoreInterfaceGenerator, abi, uwrite, uwriteln,
 };
 use wit_parser::abi::AbiVariant;
 use wit_parser::{
@@ -674,7 +674,7 @@ impl InterfaceGenerator<'_> {
                 match &ty.kind {
                     TypeDefKind::Type(ty) => self.is_primative_list(ty),
                     TypeDefKind::List(ty) if crate::world_generator::is_primitive(ty) => {
-                        return true
+                        return true;
                     }
                     _ => false,
                 }

crates/csharp/src/interface.rs

@@ -8,7 +8,7 @@ use std::collections::{HashMap, HashSet};
 use std::fmt::Write;
 use std::ops::Deref;
 use std::{iter, mem};
-use wit_bindgen_core::{uwrite, Direction, Files, InterfaceGenerator as _, WorldGenerator};
+use wit_bindgen_core::{Direction, Files, InterfaceGenerator as _, WorldGenerator, uwrite};
 use wit_component::WitPrinter;
 use wit_parser::abi::WasmType;
 use wit_parser::{
@@ -105,13 +105,13 @@ impl WorldGenerator for CSharp {
     ) -> anyhow::Result<()> {
         let name = interface_name(self, resolve, key, Direction::Import);
         self.interface_names.insert(id, name.clone());
-        let mut gen = self.interface(resolve, &name, Direction::Import);
+        let mut r#gen = self.interface(resolve, &name, Direction::Import);
 
-        let mut old_resources = mem::take(&mut gen.csharp_gen.all_resources);
-        gen.types(id);
-        let new_resources = mem::take(&mut gen.csharp_gen.all_resources);
+        let mut old_resources = mem::take(&mut r#gen.csharp_gen.all_resources);
+        r#gen.types(id);
+        let new_resources = mem::take(&mut r#gen.csharp_gen.all_resources);
         old_resources.extend(new_resources.clone());
-        gen.csharp_gen.all_resources = old_resources;
+        r#gen.csharp_gen.all_resources = old_resources;
 
         for (resource, funcs) in by_resource(
             resolve.interfaces[id]
@@ -121,23 +121,23 @@ impl WorldGenerator for CSharp {
             new_resources.keys().copied(),
         ) {
             if let Some(resource) = resource {
-                gen.start_resource(resource, Some(key));
+                r#gen.start_resource(resource, Some(key));
             }
 
             let import_module_name = &resolve.name_world_key(key);
             for func in funcs {
-                gen.import(import_module_name, func);
+                r#gen.import(import_module_name, func);
             }
 
             if resource.is_some() {
-                gen.end_resource();
+                r#gen.end_resource();
             }
         }
 
         // for anonymous types
-        gen.define_interface_types(id);
+        r#gen.define_interface_types(id);
 
-        gen.add_interface_fragment(false);
+        r#gen.add_interface_fragment(false);
 
         Ok(())
     }
@@ -153,26 +153,26 @@ impl WorldGenerator for CSharp {
 
         let name = &format!("{}-world", resolve.worlds[world].name).to_upper_camel_case();
         let name = &format!("{name}.I{name}");
-        let mut gen = self.interface(resolve, name, Direction::Import);
+        let mut r#gen = self.interface(resolve, name, Direction::Import);
 
         for (resource, funcs) in by_resource(
             funcs.iter().copied(),
-            gen.csharp_gen.world_resources.keys().copied(),
+            r#gen.csharp_gen.world_resources.keys().copied(),
         ) {
             if let Some(resource) = resource {
-                gen.start_resource(resource, None);
+                r#gen.start_resource(resource, None);
             }
 
             for func in funcs {
-                gen.import("$root", func);
+                r#gen.import("$root", func);
             }
 
             if resource.is_some() {
-                gen.end_resource();
+                r#gen.end_resource();
             }
         }
 
-        gen.add_world_fragment();
+        r#gen.add_world_fragment();
     }
 
     fn export_interface(
@@ -184,13 +184,13 @@ impl WorldGenerator for CSharp {
     ) -> anyhow::Result<()> {
         let name = interface_name(self, resolve, key, Direction::Export);
         self.interface_names.insert(id, name.clone());
-        let mut gen = self.interface(resolve, &name, Direction::Export);
+        let mut r#gen = self.interface(resolve, &name, Direction::Export);
 
-        let mut old_resources = mem::take(&mut gen.csharp_gen.all_resources);
-        gen.types(id);
-        let new_resources = mem::take(&mut gen.csharp_gen.all_resources);
+        let mut old_resources = mem::take(&mut r#gen.csharp_gen.all_resources);
+        r#gen.types(id);
+        let new_resources = mem::take(&mut r#gen.csharp_gen.all_resources);
         old_resources.extend(new_resources.clone());
-        gen.csharp_gen.all_resources = old_resources;
+        r#gen.csharp_gen.all_resources = old_resources;
 
         for (resource, funcs) in by_resource(
             resolve.interfaces[id]
@@ -200,22 +200,22 @@ impl WorldGenerator for CSharp {
             new_resources.keys().copied(),
         ) {
             if let Some(resource) = resource {
-                gen.start_resource(resource, Some(key));
+                r#gen.start_resource(resource, Some(key));
             }
 
             for func in funcs {
-                gen.export(func, Some(key));
+                r#gen.export(func, Some(key));
             }
 
             if resource.is_some() {
-                gen.end_resource();
+                r#gen.end_resource();
             }
         }
 
         // for anonymous types
-        gen.define_interface_types(id);
+        r#gen.define_interface_types(id);
 
-        gen.add_interface_fragment(true);
+        r#gen.add_interface_fragment(true);
         Ok(())
     }
 
@@ -228,23 +228,23 @@ impl WorldGenerator for CSharp {
     ) -> anyhow::Result<()> {
         let name = &format!("{}-world", resolve.worlds[world].name).to_upper_camel_case();
         let name = &format!("{name}.I{name}");
-        let mut gen = self.interface(resolve, name, Direction::Export);
+        let mut r#gen = self.interface(resolve, name, Direction::Export);
 
         for (resource, funcs) in by_resource(funcs.iter().copied(), iter::empty()) {
             if let Some(resource) = resource {
-                gen.start_resource(resource, None);
+                r#gen.start_resource(resource, None);
             }
 
             for func in funcs {
-                gen.export(func, None);
+                r#gen.export(func, None);
             }
 
             if resource.is_some() {
-                gen.end_resource();
+                r#gen.end_resource();
             }
         }
 
-        gen.add_world_fragment();
+        r#gen.add_world_fragment();
         Ok(())
     }
 
@@ -257,18 +257,18 @@ impl WorldGenerator for CSharp {
     ) {
         let name = &format!("{}-world", resolve.worlds[world].name).to_upper_camel_case();
         let name = &format!("{name}.I{name}");
-        let mut gen = self.interface(resolve, name, Direction::Import);
+        let mut r#gen = self.interface(resolve, name, Direction::Import);
 
-        let mut old_resources = mem::take(&mut gen.csharp_gen.all_resources);
+        let mut old_resources = mem::take(&mut r#gen.csharp_gen.all_resources);
         for (ty_name, ty) in types {
-            gen.define_type(ty_name, *ty);
+            r#gen.define_type(ty_name, *ty);
         }
-        let new_resources = mem::take(&mut gen.csharp_gen.all_resources);
+        let new_resources = mem::take(&mut r#gen.csharp_gen.all_resources);
         old_resources.extend(new_resources.clone());
-        gen.csharp_gen.all_resources = old_resources;
-        gen.csharp_gen.world_resources = new_resources;
+        r#gen.csharp_gen.all_resources = old_resources;
+        r#gen.csharp_gen.world_resources = new_resources;
 
-        gen.add_world_fragment();
+        r#gen.add_world_fragment();
     }
 
     fn finish(&mut self, resolve: &Resolve, id: WorldId, files: &mut Files) -> anyhow::Result<()> {

crates/csharp/src/world_generator.rs

@@ -1,10 +1,16 @@
 [package]
 name = "wit-bindgen-go"
-edition = "2024"
+authors = ["Joel Dice <[email protected]>"]
 version = { workspace = true }
+edition = { workspace = true }
 repository = { workspace = true }
 license = { workspace = true }
-rust-version = "1.85.0"
+rust-version = { workspace = true }
+homepage = 'https://github.com/bytecodealliance/wit-bindgen'
+description = """
+Go bindings generator for WIT and the component model, typically used through the
+`wit-bindgen-cli` crate.
+"""
 
 [dependencies]
 wit-bindgen-core = { workspace = true }