Update wasm-tools to 227

This commit builds on #151 to update the wasm-tools crates to the 227
(current) track. This notably includes the removal of multiple named
return types in WIT from the component model.

Author: alexcrichton

Cargo.lock

@@ -63,12 +63,12 @@ wac-parser = { path = "crates/wac-parser", version = "0.7.0-dev", default-featur
 wac-resolver = { path = "crates/wac-resolver", version = "0.7.0-dev", default-features = false }
 wac-graph = { path = "crates/wac-graph", version = "0.7.0-dev" }
 wac-types = { path = "crates/wac-types", version = "0.7.0-dev" }
-wit-parser = "0.224.0"
-wasmparser = "0.224.0"
-wit-component = "0.224.0"
-wasm-encoder = "0.224.0"
-wasmprinter = "0.224.0"
-wasm-metadata = "0.224.0"
+wit-parser = "0.227.0"
+wasmparser = "0.227.0"
+wit-component = "0.227.0"
+wasm-encoder = "0.227.0"
+wasmprinter = "0.227.0"
+wasm-metadata = "0.227.0"
 anyhow = "1.0.81"
 clap = { version = "4.5.4", features = ["derive"] }
 semver = { version = "1.0.22", features = ["serde"] }

Cargo.toml

@@ -3,9 +3,9 @@ use indexmap::IndexMap;
 use petgraph::graph::NodeIndex;
 use std::collections::HashMap;
 use wac_types::{
-    CoreExtern, DefinedType, DefinedTypeId, Enum, Flags, FuncResult, FuncTypeId, InterfaceId,
-    ItemKind, ModuleTypeId, PrimitiveType, Record, ResourceId, Type, Types, UsedType, ValueType,
-    Variant, WorldId,
+    CoreExtern, DefinedType, DefinedTypeId, Enum, Flags, FuncTypeId, InterfaceId, ItemKind,
+    ModuleTypeId, PrimitiveType, Record, ResourceId, Type, Types, UsedType, ValueType, Variant,
+    WorldId,
 };
 use wasm_encoder::{
     Alias, ComponentBuilder, ComponentCoreTypeEncoder, ComponentExportKind,
@@ -227,27 +227,11 @@ impl<'a> TypeEncoder<'a> {
             .map(|(n, ty)| (n.as_str(), self.value_type(state, *ty)))
             .collect::<Vec<_>>();
 
-        let results = match &ty.results {
-            Some(FuncResult::Scalar(ty)) => vec![("", self.value_type(state, *ty))],
-            Some(FuncResult::List(results)) => results
-                .iter()
-                .map(|(n, ty)| (n.as_str(), self.value_type(state, *ty)))
-                .collect(),
-            None => Vec::new(),
-        };
-
+        let result = ty.result.map(|ty| self.value_type(state, ty));
         let index = state.current.encodable.type_count();
         let mut encoder = state.current.encodable.ty().function();
         encoder.params(params);
-
-        match &ty.results {
-            Some(FuncResult::Scalar(_)) => {
-                encoder.result(results[0].1);
-            }
-            _ => {
-                encoder.results(results);
-            }
-        }
+        encoder.result(result);
 
         log::debug!("function type encoded to type index {index}");
         index
@@ -271,7 +255,6 @@ impl<'a> TypeEncoder<'a> {
             DefinedType::Alias(ValueType::Defined(id)) => self.defined(state, *id),
             DefinedType::Stream(ty) => self.stream(state, *ty),
             DefinedType::Future(ty) => self.future(state, *ty),
-            DefinedType::ErrorContext => self.error_context(state),
         };
 
         log::debug!("defined type encoded to type index {index}");
@@ -583,12 +566,6 @@ impl<'a> TypeEncoder<'a> {
         index
     }
 
-    fn error_context(&self, state: &mut State) -> u32 {
-        let index = state.current.encodable.type_count();
-        state.current.encodable.ty().defined_type().error_context();
-        index
-    }
-
     fn option(&self, state: &mut State, ty: ValueType) -> u32 {
         let ty = self.value_type(state, ty);
         let index = state.current.encodable.type_count();