A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Fix `named_imports` with a hyphen in interface names (#14105)
Alex Crichtond918db438524
diff --git a/crates/component-macro/tests/codegen.rs b/crates/component-macro/tests/codegen.rsindex f40ea9136e..dd237ba79b 100644--- a/crates/component-macro/tests/codegen.rs+++ b/crates/component-macro/tests/codegen.rs@@ -861,6 +861,31 @@ mod named_imports {}}+ mod hyphenated_interface_name {+ wasmtime::component::bindgen!({+ inline: "+ package foo:foo;++ interface my-itf {+ ping: func();+ }++ world the-world {+ import my-itf;+ }+ ",+ named_imports: {+ "foo:foo/my-itf": String,+ },+ });++ struct MyHost;++ impl named_imports::foo::foo::my_itf::Host for MyHost {+ fn ping(&mut self, _id: String) {}+ }+ }+mod async_store {#[derive(Clone)]pub struct MyId(u32);diff --git a/crates/wit-bindgen/src/lib.rs b/crates/wit-bindgen/src/lib.rsindex 5154f4491c..9b16226f21 100644--- a/crates/wit-bindgen/src/lib.rs+++ b/crates/wit-bindgen/src/lib.rs@@ -502,7 +502,7 @@ impl Wasmtime {let key_name = resolve.name_world_key(&key);generator.generate_add_to_linker(id, &key_name);let body = String::from(mem::take(&mut generator.src));- let interface_name = resolve.interfaces[id].name.as_ref().unwrap();+ let interface_name = to_rust_ident(resolve.interfaces[id].name.as_ref().unwrap());let body = format!("pub mod {interface_name} {{\n{body}\n}}");let path = self.generate_interface_name(resolve, id, &key, InterfaceKind::Named);self.named_import_modules