hyperlight_component_macro changes for wasm-parser (hyperlight-dev#91)

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

Cargo.lock

@@ -58,7 +58,7 @@ windows = { version = "0.61", features = ["Win32_System_Threading"] }
 page_size = "0.6.0"
 
 [dev-dependencies]
-hyperlight-component-macro = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" }
+hyperlight-component-macro = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "b61265e4aa9e2ecf8d648b994022caeea0205352" }
 examples_common = { path = "../examples_common" }
 criterion = { version = "0.6.0", features = ["html_reports"] }
 crossbeam-queue = "0.3"

src/hyperlight_wasm/Cargo.toml

@@ -11,10 +11,9 @@ name = "hyperlight_wasm_macro"
 proc-macro = true
 
 [dependencies]
-wasmparser = { version = "0.224.0" }
 quote = { version = "1.0.38" }
 proc-macro2 = { version = "1.0.93" }
 syn = { version = "2.0.96" }
 itertools = { version = "0.14.0" }
 prettyplease = { version = "0.2.31" }
-hyperlight-component-util = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" }
+hyperlight-component-util = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "b61265e4aa9e2ecf8d648b994022caeea0205352" }

src/hyperlight_wasm_macro/Cargo.lock

@@ -68,7 +68,7 @@ fn emit_import_extern_decl<'b>(
                 })
                 .unzip::<_, _, Vec<_>, Vec<_>>();
             let ret = format_ident!("ret");
-            let is_ret_empty = matches!(&ft.result, etypes::Result::Named(rs) if rs.is_empty());
+            let is_ret_empty = ft.result.is_none();
             let ur = if is_ret_empty {
                 quote! { () }
             } else {
@@ -210,7 +210,7 @@ fn emit_wasm_function_call(
 
     // if the result is empty we don't want a return result with `get_typed_func`
     let rwt = match result {
-        etypes::Result::Named(rs) if rs.is_empty() => {
+        None => {
             quote! {
                 instance.get_typed_func::<(#(#pwts,)*), ()>(&mut *store, func_idx)?
                     .call(&mut *store, (#(#pus,)*))?;