From cbdacf9430883f1c071dcd3b64a2b96c5e7e3882 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 May 2026 03:34:18 +0000 Subject: [PATCH 1/6] chore(deps): bump wasmparser from 0.248.0 to 0.249.0 Bumps [wasmparser](https://github.com/bytecodealliance/wasm-tools) from 0.248.0 to 0.249.0. - [Release notes](https://github.com/bytecodealliance/wasm-tools/releases) - [Commits](https://github.com/bytecodealliance/wasm-tools/commits) --- updated-dependencies: - dependency-name: wasmparser dependency-version: 0.249.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- src/hyperlight_component_macro/Cargo.toml | 2 +- src/hyperlight_component_util/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ea78d53f..1eb75e50f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1488,7 +1488,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser 0.248.0", + "wasmparser 0.249.0", ] [[package]] @@ -1501,7 +1501,7 @@ dependencies = [ "quote", "syn", "tracing", - "wasmparser 0.248.0", + "wasmparser 0.249.0", ] [[package]] @@ -4219,9 +4219,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.248.0" +version = "0.249.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4439c5eee9df71ee0c6efb37f63b1fcb1fec38f85f5142c54e7ed05d33091a" +checksum = "30538cae9a794215f490b532df01c557e2e2bfac92569482554acd0992a102ea" dependencies = [ "bitflags 2.11.1", "hashbrown 0.17.0", diff --git a/src/hyperlight_component_macro/Cargo.toml b/src/hyperlight_component_macro/Cargo.toml index e5d531207..82d04a9d8 100644 --- a/src/hyperlight_component_macro/Cargo.toml +++ b/src/hyperlight_component_macro/Cargo.toml @@ -16,7 +16,7 @@ name = "hyperlight_component_macro" proc-macro = true [dependencies] -wasmparser = { version = "0.248.0" } +wasmparser = { version = "0.249.0" } quote = { version = "1.0.45" } proc-macro2 = { version = "1.0.106" } syn = { version = "2.0.117" } diff --git a/src/hyperlight_component_util/Cargo.toml b/src/hyperlight_component_util/Cargo.toml index a12192c81..f4596d650 100644 --- a/src/hyperlight_component_util/Cargo.toml +++ b/src/hyperlight_component_util/Cargo.toml @@ -15,7 +15,7 @@ Shared implementation for the procedural macros that generate Hyperlight host an name = "hyperlight_component_util" [dependencies] -wasmparser = { version = "0.248.0" } +wasmparser = { version = "0.249.0" } quote = { version = "1.0.45" } proc-macro2 = { version = "1.0.106" } syn = { version = "2.0.117" } From 50bdf4bf0809d06d8a4858d09dde3a06c7878d95 Mon Sep 17 00:00:00 2001 From: "dependabot-pr-auto-approver[bot]" <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> Date: Mon, 18 May 2026 03:38:04 +0000 Subject: [PATCH 2/6] chore: update guest Cargo.lock files Automatically updated by dependabot-update-guest-locks workflow. Triggered by: chore(deps): bump wasmparser from 0.248.0 to 0.249.0 Signed-off-by: dependabot-pr-auto-approver[bot] <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> --- src/tests/rust_guests/witguest/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/rust_guests/witguest/Cargo.lock b/src/tests/rust_guests/witguest/Cargo.lock index 7664466b2..b0920becf 100644 --- a/src/tests/rust_guests/witguest/Cargo.lock +++ b/src/tests/rust_guests/witguest/Cargo.lock @@ -783,9 +783,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "wasmparser" -version = "0.248.0" +version = "0.249.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4439c5eee9df71ee0c6efb37f63b1fcb1fec38f85f5142c54e7ed05d33091a" +checksum = "30538cae9a794215f490b532df01c557e2e2bfac92569482554acd0992a102ea" dependencies = [ "bitflags", "hashbrown", From ca58d74ccd108c3534d81717e1df120071b838bd Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 28 May 2026 09:19:47 -0700 Subject: [PATCH 3/6] fix: update for wasmparser 0.249 API changes Signed-off-by: James Sturtevant --- src/hyperlight_component_util/src/component.rs | 2 +- src/hyperlight_component_util/src/elaborate.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hyperlight_component_util/src/component.rs b/src/hyperlight_component_util/src/component.rs index 92910e223..ff90ec9ec 100644 --- a/src/hyperlight_component_util/src/component.rs +++ b/src/hyperlight_component_util/src/component.rs @@ -118,7 +118,7 @@ pub fn read_component_single_exported_type<'a>( // picks the world index if world_name is passed in the proc_macro // else picks the index of last type, exported by core module if let Some(world) = world_name.as_ref() { - let name = ce.name.0; + let name = ce.name.name; if name.eq_ignore_ascii_case(world) { selected_type_idx = Some(ctx.types.len() - 1); } diff --git a/src/hyperlight_component_util/src/elaborate.rs b/src/hyperlight_component_util/src/elaborate.rs index 1fe7e232f..10bb6ad38 100644 --- a/src/hyperlight_component_util/src/elaborate.rs +++ b/src/hyperlight_component_util/src/elaborate.rs @@ -538,11 +538,11 @@ impl<'p, 'a> Ctx<'p, 'a> { } InstanceTypeDeclaration::Export { name, ty } => { let (vs, ed) = self.elab_extern_desc(ty)?; - let sub = self.bound_to_evars(Some(name.0), &vs); + let sub = self.bound_to_evars(Some(name.name), &vs); let ed = sub.extern_desc(&ed).not_void(); self.add_ed(&ed); Ok(Some(ExternDecl { - kebab_name: name.0, + kebab_name: name.name, desc: ed, })) } @@ -636,25 +636,25 @@ impl<'p, 'a> Ctx<'p, 'a> { } ComponentTypeDeclaration::Export { name, ty, .. } => { let (vs, ed) = self.elab_extern_desc(ty)?; - let sub = self.bound_to_evars(Some(name.0), &vs); + let sub = self.bound_to_evars(Some(name.name), &vs); let ed = sub.extern_desc(&ed).not_void(); self.add_ed(&ed); Ok(( None, Some(ExternDecl { - kebab_name: name.0, + kebab_name: name.name, desc: ed, }), )) } ComponentTypeDeclaration::Import(i) => { let (vs, ed) = self.elab_extern_desc(&i.ty)?; - let sub = self.bound_to_uvars(Some(i.name.0), &vs, true); + let sub = self.bound_to_uvars(Some(i.name.name), &vs, true); let ed = sub.extern_desc(&ed).not_void(); self.add_ed(&ed); Ok(( Some(ExternDecl { - kebab_name: i.name.0, + kebab_name: i.name.name, desc: ed, }), None, From 79f1d436c358eb49a364806d7671566241c4ae80 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 28 May 2026 09:48:14 -0700 Subject: [PATCH 4/6] chore: remove unused macro wasmparser dependency Signed-off-by: James Sturtevant --- Cargo.lock | 1 - src/hyperlight_component_macro/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1eb75e50f..259c7bfca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1488,7 +1488,6 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser 0.249.0", ] [[package]] diff --git a/src/hyperlight_component_macro/Cargo.toml b/src/hyperlight_component_macro/Cargo.toml index 82d04a9d8..6800a06fd 100644 --- a/src/hyperlight_component_macro/Cargo.toml +++ b/src/hyperlight_component_macro/Cargo.toml @@ -16,7 +16,6 @@ name = "hyperlight_component_macro" proc-macro = true [dependencies] -wasmparser = { version = "0.249.0" } quote = { version = "1.0.45" } proc-macro2 = { version = "1.0.106" } syn = { version = "2.0.117" } From 127b257f689ba3d271a1d70288278bd21f9a5143 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 28 May 2026 09:53:33 -0700 Subject: [PATCH 5/6] refactor: clarify component extern name access Signed-off-by: James Sturtevant --- .../src/component.rs | 6 +-- .../src/elaborate.rs | 40 +++++++++++++------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/hyperlight_component_util/src/component.rs b/src/hyperlight_component_util/src/component.rs index ff90ec9ec..55fbc333c 100644 --- a/src/hyperlight_component_util/src/component.rs +++ b/src/hyperlight_component_util/src/component.rs @@ -20,8 +20,8 @@ use wasmparser::Payload::{ ComponentAliasSection, ComponentExportSection, ComponentTypeSection, Version, }; use wasmparser::{ - ComponentAlias, ComponentExternalKind, ComponentOuterAliasKind, ComponentType, - ComponentTypeRef, Payload, + ComponentAlias, ComponentExternName, ComponentExternalKind, ComponentOuterAliasKind, + ComponentType, ComponentTypeRef, Payload, }; use crate::etypes::{Component, Ctx, Defined}; @@ -118,7 +118,7 @@ pub fn read_component_single_exported_type<'a>( // picks the world index if world_name is passed in the proc_macro // else picks the index of last type, exported by core module if let Some(world) = world_name.as_ref() { - let name = ce.name.name; + let ComponentExternName { name, .. } = ce.name; if name.eq_ignore_ascii_case(world) { selected_type_idx = Some(ctx.types.len() - 1); } diff --git a/src/hyperlight_component_util/src/elaborate.rs b/src/hyperlight_component_util/src/elaborate.rs index 10bb6ad38..d24191946 100644 --- a/src/hyperlight_component_util/src/elaborate.rs +++ b/src/hyperlight_component_util/src/elaborate.rs @@ -24,10 +24,10 @@ limitations under the License. //! substitute.rs for more details of the approach here). use wasmparser::{ - ComponentAlias, ComponentDefinedType, ComponentFuncType, ComponentOuterAliasKind, - ComponentType, ComponentTypeDeclaration, ComponentTypeRef, ComponentValType, - CompositeInnerType, CoreType, InstanceTypeDeclaration, ModuleTypeDeclaration, OuterAliasKind, - PrimitiveValType, TypeBounds, TypeRef, + ComponentAlias, ComponentDefinedType, ComponentExternName, ComponentFuncType, + ComponentOuterAliasKind, ComponentType, ComponentTypeDeclaration, ComponentTypeRef, + ComponentValType, CompositeInnerType, CoreType, InstanceTypeDeclaration, ModuleTypeDeclaration, + OuterAliasKind, PrimitiveValType, TypeBounds, TypeRef, }; use crate::etypes::{ @@ -536,13 +536,19 @@ impl<'p, 'a> Ctx<'p, 'a> { self.add_core_or_component_ed(ed); Ok(None) } - InstanceTypeDeclaration::Export { name, ty } => { + InstanceTypeDeclaration::Export { + name: export_name, + ty, + } => { + let ComponentExternName { + name: kebab_name, .. + } = *export_name; let (vs, ed) = self.elab_extern_desc(ty)?; - let sub = self.bound_to_evars(Some(name.name), &vs); + let sub = self.bound_to_evars(Some(kebab_name), &vs); let ed = sub.extern_desc(&ed).not_void(); self.add_ed(&ed); Ok(Some(ExternDecl { - kebab_name: name.name, + kebab_name, desc: ed, })) } @@ -634,27 +640,37 @@ impl<'p, 'a> Ctx<'p, 'a> { self.add_core_or_component_ed(ed); Ok((None, None)) } - ComponentTypeDeclaration::Export { name, ty, .. } => { + ComponentTypeDeclaration::Export { + name: export_name, + ty, + .. + } => { + let ComponentExternName { + name: kebab_name, .. + } = *export_name; let (vs, ed) = self.elab_extern_desc(ty)?; - let sub = self.bound_to_evars(Some(name.name), &vs); + let sub = self.bound_to_evars(Some(kebab_name), &vs); let ed = sub.extern_desc(&ed).not_void(); self.add_ed(&ed); Ok(( None, Some(ExternDecl { - kebab_name: name.name, + kebab_name, desc: ed, }), )) } ComponentTypeDeclaration::Import(i) => { + let ComponentExternName { + name: kebab_name, .. + } = i.name; let (vs, ed) = self.elab_extern_desc(&i.ty)?; - let sub = self.bound_to_uvars(Some(i.name.name), &vs, true); + let sub = self.bound_to_uvars(Some(kebab_name), &vs, true); let ed = sub.extern_desc(&ed).not_void(); self.add_ed(&ed); Ok(( Some(ExternDecl { - kebab_name: i.name.name, + kebab_name, desc: ed, }), None, From ac7edfe0b5450557e2b75d63cdb2318ad6bb4a23 Mon Sep 17 00:00:00 2001 From: "dependabot-pr-auto-approver[bot]" <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 16:53:15 +0000 Subject: [PATCH 6/6] chore: update guest Cargo.lock files Automatically updated by dependabot-update-guest-locks workflow. Triggered by: chore(deps): bump wasmparser from 0.248.0 to 0.249.0 Signed-off-by: dependabot-pr-auto-approver[bot] <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> (cherry picked from commit 6a15a6a0b53714a2420b2a1fa3856b0494088f80) --- src/tests/rust_guests/witguest/Cargo.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tests/rust_guests/witguest/Cargo.lock b/src/tests/rust_guests/witguest/Cargo.lock index b0920becf..be4530380 100644 --- a/src/tests/rust_guests/witguest/Cargo.lock +++ b/src/tests/rust_guests/witguest/Cargo.lock @@ -264,7 +264,6 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser", ] [[package]]