Remove usage of Interface::parse_file in wit-component tests (#430)

* Remove a dead `load` function in bindgen-core

* Update all `interfaces` tests to use worlds

Migrate all `import-*.wit` and `export-*.wit` files to `world.wit` and
additionally plumb through various fixes and such throughout
`wit-component` to print the right names and support worlds when printing.

* Migrate `components` tests to world syntax

Replace all various `*.wit` files with singular `world.wit` files, plus
optional `adapt-*-world.wit` files for adapters in their tests. The CLI
interface for `wit-component` has also changed here to take a world file
as input, optionally take a module to represent types-only encodings,
and then additionally prints to stdout by default instead of a file.

* Fix guest generators for recent changes

* Fix CLI build

Author: alexcrichton

Cargo.lock

@@ -1,8 +1,6 @@
-use anyhow::Result;
 use std::collections::{btree_map::Entry, BTreeMap, HashMap};
 use std::fmt::{self, Write};
 use std::ops::Deref;
-use std::path::Path;
 use wit_component::ComponentInterfaces;
 use wit_parser::*;
 
@@ -261,10 +259,6 @@ impl Files {
     }
 }
 
-pub fn load(path: impl AsRef<Path>) -> Result<Interface> {
-    Interface::parse_file(path)
-}
-
 #[derive(Default)]
 pub struct Source {
     s: String,

crates/bindgen-core/src/lib.rs

@@ -95,7 +95,7 @@ impl WorldGenerator for C {
             if i == 0 {
                 uwriteln!(gen.src.h_fns, "\n// Exported Functions from `{name}`");
             }
-            gen.export(func, false);
+            gen.export(func, Some(name));
         }
 
         gen.finish();
@@ -111,7 +111,7 @@ impl WorldGenerator for C {
             if i == 0 {
                 uwriteln!(gen.src.h_fns, "\n// Exported Functions from `{name}`");
             }
-            gen.export(func, true);
+            gen.export(func, None);
         }
 
         gen.finish();
@@ -715,12 +715,10 @@ impl InterfaceGenerator<'_> {
         self.src.c_adapters("}\n");
     }
 
-    fn export(&mut self, func: &Function, is_default: bool) {
+    fn export(&mut self, func: &Function, interface_name: Option<&str>) {
         let sig = self.iface.wasm_signature(AbiVariant::GuestExport, func);
 
-        // Currently the C generator always emits default exports
-        // This needs to change once the generator works from a world
-        let export_name = self.iface.core_export_name(is_default, func);
+        let export_name = func.core_export_name(interface_name);
 
         // Print the actual header for this function into the header file, and
         // it's what we'll be calling.

crates/gen-guest-c/src/lib.rs

@@ -123,12 +123,12 @@ impl WorldGenerator for RustWasm {
 
     fn export(&mut self, name: &str, iface: &Interface, _files: &mut Files) {
         self.interface(iface, TypeMode::Owned, false)
-            .generate_exports(name, false);
+            .generate_exports(name, Some(name));
     }
 
     fn export_default(&mut self, name: &str, iface: &Interface, _files: &mut Files) {
         self.interface(iface, TypeMode::Owned, false)
-            .generate_exports(name, true);
+            .generate_exports(name, None);
     }
 
     fn finish(&mut self, name: &str, interfaces: &ComponentInterfaces, files: &mut Files) {
@@ -244,7 +244,7 @@ struct InterfaceGenerator<'a> {
 }
 
 impl InterfaceGenerator<'_> {
-    fn generate_exports(mut self, name: &str, default_export: bool) {
+    fn generate_exports(mut self, name: &str, interface_name: Option<&str>) {
         self.types();
 
         let camel = name.to_upper_camel_case();
@@ -261,7 +261,7 @@ impl InterfaceGenerator<'_> {
         uwriteln!(self.src, "}}");
 
         for func in self.iface.functions.iter() {
-            self.generate_guest_export(name, func, default_export);
+            self.generate_guest_export(name, func, interface_name);
         }
 
         self.append_submodule(name);
@@ -338,7 +338,12 @@ impl InterfaceGenerator<'_> {
         }
     }
 
-    fn generate_guest_export(&mut self, module_name: &str, func: &Function, default_export: bool) {
+    fn generate_guest_export(
+        &mut self,
+        module_name: &str,
+        func: &Function,
+        interface_name: Option<&str>,
+    ) {
         if self.gen.skip.contains(&func.name) {
             return;
         }
@@ -347,7 +352,7 @@ impl InterfaceGenerator<'_> {
         let trait_bound = module_name.to_upper_camel_case();
         let iface_snake = self.iface.name.to_snake_case();
         let name_snake = func.name.to_snake_case();
-        let export_name = self.iface.core_export_name(default_export, func);
+        let export_name = func.core_export_name(interface_name);
         let mut macro_src = Source::default();
         // Generate, simultaneously, the actual lifting/lowering function within
         // the original module (`call_{name_snake}`) as well as the function

crates/gen-guest-rust/src/lib.rs

@@ -96,7 +96,7 @@ impl WorldGenerator for TeaVmJava {
         gen.types();
 
         for func in iface.functions.iter() {
-            gen.export(func, false);
+            gen.export(func, Some(name));
         }
 
         gen.add_class();
@@ -107,7 +107,7 @@ impl WorldGenerator for TeaVmJava {
         gen.types();
 
         for func in iface.functions.iter() {
-            gen.export(func, true);
+            gen.export(func, None);
         }
 
         gen.add_class();
@@ -399,12 +399,10 @@ impl InterfaceGenerator<'_> {
         );
     }
 
-    fn export(&mut self, func: &Function, is_default: bool) {
+    fn export(&mut self, func: &Function, interface_name: Option<&str>) {
         let sig = self.iface.wasm_signature(AbiVariant::GuestExport, func);
 
-        // Currently the Java generator always emits default exports
-        // This needs to change once the generator works from a world
-        let export_name = self.iface.core_export_name(is_default, func);
+        let export_name = func.core_export_name(interface_name);
 
         let mut bindgen = FunctionBindgen::new(
             self,

crates/gen-guest-teavm-java/src/lib.rs

@@ -171,9 +171,9 @@ pub fn dummy_module(interfaces: &ComponentInterfaces) -> Vec<u8> {
         }
     }
 
-    for (_, export) in interfaces.exports.iter() {
+    for (name, export) in interfaces.exports.iter() {
         for func in export.functions.iter() {
-            let name = format!("{}#{}", export.name, func.name);
+            let name = func.core_export_name(Some(name));
             push_func(&mut wat, &name, export, func);
         }
     }

crates/test-helpers/src/lib.rs

@@ -25,6 +25,8 @@ env_logger = { workspace = true, optional = true }
 log = "0.4.17"
 bitflags = { workspace = true }
 indexmap = { workspace = true }
+atty = { version = "0.2.14", optional = true }
+wasmprinter = { workspace = true, optional = true }
 
 [dev-dependencies]
 wasmprinter = { workspace = true }
@@ -35,4 +37,4 @@ test-helpers = { path = '../test-helpers', default-features = false }
 
 [features]
 default = ["cli"]
-cli = ["dep:clap", "dep:env_logger"]
+cli = ["dep:clap", "dep:env_logger", "dep:atty", "dep:wasmprinter"]