Update wasm-tools crates (#4246)
This commit updates the wasm-tools family of crates, notably pulling in the refactorings and updates from bytecodealliance/wasm-tools#621 for the latest iteration of the component model. This commit additionally updates all support for the component model for these changes, notably: * Many bits and pieces of type information was refactored. Many `FooTypeIndex` namings are now `TypeFooIndex`. Additionally there is now `TypeIndex` as well as `ComponentTypeIndex` for the two type index spaces in a component. * A number of new sections are now processed to handle the core and component variants. * Internal maps were split such as the `funcs` map into `component_funcs` and `funcs` (same for `instances`). * Canonical options are now processed individually instead of one bulk `into` definition. Overall this was not a major update to the internals of handling the component model in Wasmtime. Instead this was mostly a surface-level refactoring to make sure that everything lines up with the new binary format for components. * All text syntax used in tests was updated to the new syntax.
This commit is contained in:
@@ -15,8 +15,8 @@ use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
use wasmparser::{
|
||||
CustomSectionReader, DataKind, ElementItem, ElementKind, Encoding, ExternalKind, FuncValidator,
|
||||
FunctionBody, NameSectionReader, Naming, Operator, Parser, Payload, TypeDef, TypeRef,
|
||||
Validator, ValidatorResources,
|
||||
FunctionBody, NameSectionReader, Naming, Operator, Parser, Payload, Type, TypeRef, Validator,
|
||||
ValidatorResources,
|
||||
};
|
||||
|
||||
/// Object containing the standalone environment information.
|
||||
@@ -130,8 +130,8 @@ pub struct WasmFileInfo {
|
||||
#[derive(Debug)]
|
||||
#[allow(missing_docs)]
|
||||
pub struct FunctionMetadata {
|
||||
pub params: Box<[wasmparser::Type]>,
|
||||
pub locals: Box<[(u32, wasmparser::Type)]>,
|
||||
pub params: Box<[wasmparser::ValType]>,
|
||||
pub locals: Box<[(u32, wasmparser::ValType)]>,
|
||||
}
|
||||
|
||||
impl<'a, 'data> ModuleEnvironment<'a, 'data> {
|
||||
@@ -216,7 +216,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
|
||||
|
||||
for ty in types {
|
||||
match ty? {
|
||||
TypeDef::Func(wasm_func_ty) => {
|
||||
Type::Func(wasm_func_ty) => {
|
||||
self.declare_type_func(wasm_func_ty.try_into()?)?;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user