fixup! Updates for wasmparser apis

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

Author: jsturtevant

src/hyperlight_component_util/src/etypes.rs

@@ -136,11 +136,13 @@ pub struct Param<'a> {
     pub ty: Value<'a>,
 }
 
+pub type Result<'a> = Option<Value<'a>>;
+
 /// functype_e in the specification
 #[derive(Debug, Clone)]
 pub struct Func<'a> {
     pub params: Vec<Param<'a>>,
-    pub result: Option<Value<'a>>,
+    pub result: Result<'a>,
 }
 
 /// In the spec, this does not exist, but a validation rule ensures an

src/hyperlight_component_util/src/hl.rs

@@ -19,7 +19,7 @@ use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};
 
 use crate::emit::{State, kebab_to_cons, kebab_to_var};
-use crate::etypes::{Defined, Handleable, TypeBound, Tyvar, Value};
+use crate::etypes::{self, Defined, Handleable, TypeBound, Tyvar, Value};
 use crate::rtypes;
 
 /// Construct a string that can be used "on the wire" to identify a
@@ -653,7 +653,7 @@ pub fn emit_hl_unmarshal_param(s: &mut State, id: Ident, pt: &Value) -> TokenStr
 ///
 /// Precondition: the result type must only be a named result if there
 /// are no names in it (i.e. a unit type)
-pub fn emit_hl_unmarshal_result(s: &mut State, id: Ident, rt: &Option<Value<'_>>) -> TokenStream {
+pub fn emit_hl_unmarshal_result(s: &mut State, id: Ident, rt: &etypes::Result<'_>) -> TokenStream {
     match rt {
         Some(vt) => {
             let toks = emit_hl_unmarshal_value(s, id, vt);
@@ -677,7 +677,7 @@ pub fn emit_hl_marshal_param(s: &mut State, id: Ident, pt: &Value) -> TokenStrea
 ///
 /// Precondition: the result type must only be a named result if there
 /// are no names in it (a unit type)
-pub fn emit_hl_marshal_result(s: &mut State, id: Ident, rt: &Option<Value<'_>>) -> TokenStream {
+pub fn emit_hl_marshal_result(s: &mut State, id: Ident, rt: &etypes::Result) -> TokenStream {
     match rt {
         None => quote! { ::alloc::vec::Vec::new() },
         Some(vt) => {

src/hyperlight_component_util/src/rtypes.rs

@@ -29,8 +29,8 @@ use crate::emit::{
     split_wit_name,
 };
 use crate::etypes::{
-    Component, Defined, ExternDecl, ExternDesc, Func, Handleable, ImportExport, Instance, Param,
-    TypeBound, Tyvar, Value,
+    self, Component, Defined, ExternDecl, ExternDesc, Func, Handleable, ImportExport, Instance,
+    Param, TypeBound, Tyvar, Value,
 };
 
 /// When referring to an instance or resource trait, emit a token
@@ -521,7 +521,7 @@ pub fn emit_func_param(s: &mut State, p: &Param) -> TokenStream {
 ///
 /// Precondition: the result type must only be a named result if there
 /// are no names in it (i.e. a unit type)
-pub fn emit_func_result(s: &mut State, r: &Option<Value<'_>>) -> TokenStream {
+pub fn emit_func_result(s: &mut State, r: &etypes::Result<'_>) -> TokenStream {
     match r {
         Some(vt) => emit_value(s, vt),
         None => quote! { () },

src/hyperlight_component_util/src/substitute.rs

@@ -134,7 +134,10 @@ where
         pts.iter().map(|pt| self.param(pt)).collect()
     }
 
-    fn result(&self, rt: &Option<Value<'a>>) -> Result<Option<Value<'a>>, Self::Error> {
+    fn result(
+        &self,
+        rt: &crate::etypes::Result<'a>,
+    ) -> Result<crate::etypes::Result<'a>, Self::Error> {
         Ok(match rt {
             Some(vt) => Some(self.value(vt)?),
             None => None,