Update wasm-tools/wit-bindgen dependencies (#12121)

This pulls in wasm-tools support for custom-descriptors which required
adding more match arms in a few locations. Wasmtime doesn't support
this, however, so it should all be rejected during validation.

Author: alexcrichton

Cargo.lock

@@ -333,22 +333,22 @@ io-lifetimes = { version = "2.0.3", default-features = false }
 io-extras = "0.18.4"
 rustix = "1.0.8"
 # wit-bindgen:
-wit-bindgen = { version = "0.48.0", default-features = false }
-wit-bindgen-rust-macro = { version = "0.48.0", default-features = false }
+wit-bindgen = { version = "0.49.0", default-features = false }
+wit-bindgen-rust-macro = { version = "0.49.0", default-features = false }
 
 # wasm-tools family:
-wasmparser = { version = "0.242.0", default-features = false, features = ['simd'] }
-wat = "1.242.0"
-wast = "242.0.0"
-wasmprinter = "0.242.0"
-wasm-encoder = "0.242.0"
-wasm-smith = "0.242.0"
-wasm-mutate = "0.242.0"
-wit-parser = "0.242.0"
-wit-component = "0.242.0"
-wasm-wave = "0.242.0"
-wasm-compose = "0.242.0"
-json-from-wast = "0.242.0"
+wasmparser = { version = "0.243.0", default-features = false, features = ['simd'] }
+wat = "1.243.0"
+wast = "243.0.0"
+wasmprinter = "0.243.0"
+wasm-encoder = "0.243.0"
+wasm-smith = "0.243.0"
+wasm-mutate = "0.243.0"
+wit-parser = "0.243.0"
+wit-component = "0.243.0"
+wasm-wave = "0.243.0"
+wasm-compose = "0.243.0"
+json-from-wast = "0.243.0"
 
 # Non-Bytecode Alliance maintained dependencies:
 # --------------------------

Cargo.toml

@@ -369,6 +369,9 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
                             self.result.module.num_imported_tags += 1;
                             EntityType::Tag(tag)
                         }
+                        TypeRef::FuncExact(_) => {
+                            bail!("custom-descriptors proposal not implemented yet");
+                        }
                     };
                     self.declare_import(import.module, import.name, ty);
                 }
@@ -471,7 +474,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
                 for entry in exports {
                     let wasmparser::Export { name, kind, index } = entry?;
                     let entity = match kind {
-                        ExternalKind::Func => {
+                        ExternalKind::Func | ExternalKind::FuncExact => {
                             let index = FuncIndex::from_u32(index);
                             self.flag_func_escaped(index);
                             EntityIndex::Function(index)

crates/environ/src/compile/module_environ.rs

@@ -1394,7 +1394,7 @@ impl<'a, 'data> Translator<'a, 'data> {
         let mut map = HashMap::with_capacity(exports.len());
         for export in exports {
             let idx = match export.kind {
-                wasmparser::ExternalKind::Func => {
+                wasmparser::ExternalKind::Func | wasmparser::ExternalKind::FuncExact => {
                     let index = FuncIndex::from_u32(export.index);
                     EntityIndex::Function(index)
                 }
@@ -1491,7 +1491,9 @@ impl<'a, 'data> Translator<'a, 'data> {
         name: &'data str,
     ) -> LocalInitializer<'data> {
         match kind {
-            wasmparser::ExternalKind::Func => LocalInitializer::AliasExportFunc(instance, name),
+            wasmparser::ExternalKind::Func | wasmparser::ExternalKind::FuncExact => {
+                LocalInitializer::AliasExportFunc(instance, name)
+            }
             wasmparser::ExternalKind::Memory => LocalInitializer::AliasExportMemory(instance, name),
             wasmparser::ExternalKind::Table => LocalInitializer::AliasExportTable(instance, name),
             wasmparser::ExternalKind::Global => LocalInitializer::AliasExportGlobal(instance, name),

crates/environ/src/component/translate.rs

@@ -412,6 +412,7 @@ impl ComponentTypesBuilder {
             Memory(ty) => EntityType::Memory((*ty).into()),
             Global(ty) => EntityType::Global(self.convert_global_type(ty)?),
             Tag(_) => bail!("exceptions proposal not implemented"),
+            FuncExact(_) => bail!("custom-descriptors proposal not implemented"),
         })
     }
 

crates/environ/src/component/types_builder.rs

@@ -37,6 +37,7 @@ fn main() -> Result<()> {
                         TypeRef::Global(_) => bail!("should not import globals"),
                         TypeRef::Memory(_) => {}
                         TypeRef::Tag(_) => bail!("unsupported `tag` type"),
+                        TypeRef::FuncExact(_) => bail!("unsupported exact `func` type"),
                     }
                 }
             }

crates/wasi-preview1-component-adapter/verify/src/main.rs

@@ -112,7 +112,7 @@ impl<'a> ComponentContext<'a> {
 
     pub(crate) fn inc_core(&mut self, kind: wasmparser::ExternalKind) {
         match kind {
-            wasmparser::ExternalKind::Func => {
+            wasmparser::ExternalKind::Func | wasmparser::ExternalKind::FuncExact => {
                 self.inc_core_funcs();
             }
             wasmparser::ExternalKind::Memory => {

crates/wizer/src/component/info.rs

@@ -128,6 +128,9 @@ impl<'a> ModuleContext<'a> {
             wasmparser::TypeRef::Tag(_) => {
                 unreachable!("exceptions are unsupported; checked in validation")
             }
+            wasmparser::TypeRef::FuncExact(_) => {
+                unreachable!("custom-descriptors are unsupported; checked in validation")
+            }
         }
     }
 

crates/wizer/src/info.rs

@@ -206,6 +206,7 @@ impl Wizer {
                     anyhow::bail!("imported memories are not supported")
                 }
                 wasmparser::TypeRef::Func(_) => {}
+                wasmparser::TypeRef::FuncExact(_) => {}
                 wasmparser::TypeRef::Tag(_) => {}
             }
         }

crates/wizer/src/lib.rs

@@ -120,6 +120,7 @@ fn export_section<'a>(
         match export.kind {
             wasmparser::ExternalKind::Tag
             | wasmparser::ExternalKind::Func
+            | wasmparser::ExternalKind::FuncExact
             | wasmparser::ExternalKind::Table
             | wasmparser::ExternalKind::Memory
             | wasmparser::ExternalKind::Global => {