address review feedback

- Create a named constant `BARE_FUNCTION_NAMESPACE` - Swap `Source` instances instead of trying to merge them Signed-off-by: Joel Dice <joel.dice@fermyon.com>
bytecodealliance · Aug 22, 2023 · c0d2a39 · c0d2a39
1 parent d31a7bf
commit c0d2a39
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 36 deletions.
diff --git a/rust/bindgen/src/bindgen.rs b/rust/bindgen/src/bindgen.rs
@@ -46,6 +46,10 @@ use wit_bindgen_core::abi::{self, AbiVariant, Bindgen, Bitcast, Instruction, Lif
 use wit_component::DecodedWasm;
 use wit_parser::*;
 
+/// The name under which to group "bare" host functions (i.e. those imported directly by the world rather than via
+/// an interface).
+const BARE_FUNCTION_NAMESPACE: &str = "host";
+
 #[derive(Default)]
 pub struct WasmtimePy {
     // `$out_dir/__init__.py`
@@ -144,7 +148,7 @@ impl WasmtimePy {
             }
         }
         if !root_functions.is_empty() {
-            self.import_functions(&resolve, "host", &root_functions);
+            self.import_functions(&resolve, &root_functions);
         }
 
         for (world_key, export) in world.exports.clone().into_iter() {
@@ -375,10 +379,14 @@ impl WasmtimePy {
         self.imports.push(name.to_string());
     }
 
-    fn import_functions(&mut self, resolve: &Resolve, world_name: &str, functions: &[Function]) {
+    fn import_functions(&mut self, resolve: &Resolve, functions: &[Function]) {
+        let src = mem::take(&mut self.imports_init);
         let mut gen = self.interface(resolve);
+        gen.src = src;
 
-        let camel = world_name.to_upper_camel_case().escape();
+        let camel = BARE_FUNCTION_NAMESPACE.to_upper_camel_case();
+        gen.src.pyimport("typing", "Protocol");
+        gen.src.pyimport("abc", "abstractmethod");
         uwriteln!(gen.src, "class {camel}(Protocol):");
         gen.src.indent();
         for func in functions.iter() {
@@ -392,10 +400,7 @@ impl WasmtimePy {
         gen.src.dedent();
         gen.src.push_str("\n");
 
-        let src = gen.src;
-        self.imports_init.pyimport("typing", "Protocol");
-        self.imports_init.pyimport("abc", "abstractmethod");
-        self.imports_init.push_src(src);
+        self.imports_init = gen.src;
     }
 
     fn export_interface(
@@ -425,7 +430,9 @@ impl WasmtimePy {
             uwriteln!(self.imports_init, "class {camel}Imports:");
             self.imports_init.indent();
             if has_root_imports {
-                self.imports_init.push_str("host: Host\n");
+                let camel = BARE_FUNCTION_NAMESPACE.to_upper_camel_case();
+                let snake = BARE_FUNCTION_NAMESPACE.to_snake_case();
+                uwriteln!(self.imports_init, "{snake}: {camel}");
             }
             for import in self.imports.iter() {
                 let snake = import.to_snake_case().escape();

diff --git a/rust/bindgen/src/imports.rs b/rust/bindgen/src/imports.rs
@@ -19,28 +19,6 @@ impl PyImports {
         push(&mut self.typing_imports, module, name.into())
     }
 
-    pub fn merge(&mut self, imports: PyImports) {
-        for (module, names) in imports.pyimports {
-            if let Some(names) = names {
-                for name in names {
-                    self.pyimport(&module, Some(name.as_str()));
-                }
-            } else {
-                self.pyimport(&module, None);
-            }
-        }
-
-        for (module, names) in imports.typing_imports {
-            if let Some(names) = names {
-                for name in names {
-                    self.typing_import(&module, Some(name.as_str()));
-                }
-            } else {
-                self.typing_import(&module, None);
-            }
-        }
-    }
-
     pub fn is_empty(&self) -> bool {
         self.pyimports.is_empty()
     }

diff --git a/rust/bindgen/src/source.rs b/rust/bindgen/src/source.rs
@@ -138,12 +138,6 @@ impl Source {
     pub fn replace_body(&mut self, body: Body) -> String {
         mem::replace(&mut self.body, body).contents
     }
-
-    pub fn push_src(&mut self, src: Source) {
-        assert!(self.body.indent == src.body.indent);
-        self.imports.merge(src.imports);
-        self.body.contents.push_str(&src.body.contents);
-    }
 }
 
 impl Write for Source {