update to go_package_name

Signed-off-by: Jeremy Fleitz <jeremy@cosmonic.com>

Author: jfleitz

crates/go/src/lib.rs

@@ -252,7 +252,7 @@ impl Go {
         if local == owner && (exported ^ in_import) {
             String::new()
         } else {
-            let package = self.interface_name(resolve, owner);
+            let package = self.go_package_name(resolve, owner);
             let package = if exported {
                 format!("export_{package}")
             } else {
@@ -638,7 +638,7 @@ func Lift{upper_kind}{camel}(handle int32) *witTypes.{upper_kind}Reader[{payload
                                 } else {
                                     format!(
                                         "{}_",
-                                        self.interface_name(
+                                        self.go_package_name(
                                             resolve,
                                             Some(
                                                 &self
@@ -741,11 +741,11 @@ impl WorldGenerator for Go {
     ) -> Result<()> {
         self.interface_names.insert(id, name.clone());
 
-        let package = self.interface_name(resolve, Some(name));
+        let go_package_name = self.go_package_name(resolve, Some(name));
         let mut data = {
             let mut generator = InterfaceGenerator::new(self, resolve, Some((id, name)), true);
             for (name, ty) in resolve.interfaces[id].types.iter() {
-                if generator.generator.types.insert((package.clone(), *ty)) {
+                if generator.generator.types.insert((go_package_name.clone(), *ty)) {
                     generator.define_type(name, *ty);
                 }
             }
@@ -755,7 +755,7 @@ impl WorldGenerator for Go {
         for (_, func) in &resolve.interfaces[id].functions {
             data.extend(self.import(resolve, func, Some(name)));
         }
-        self.interfaces.entry(package).or_default().extend(data);
+        self.interfaces.entry(go_package_name).or_default().extend(data);
 
         Ok(())
     }
@@ -772,7 +772,7 @@ impl WorldGenerator for Go {
             data.extend(self.import(resolve, func, None));
         }
         self.interfaces
-            .entry(self.interface_name(resolve, None))
+            .entry(self.go_package_name(resolve, None))
             .or_default()
             .extend(data);
     }
@@ -786,14 +786,14 @@ impl WorldGenerator for Go {
     ) -> Result<()> {
         self.interface_names.insert(id, name.clone());
 
-        let package = self.interface_name(resolve, Some(name));
+        let go_package_name = self.go_package_name(resolve, Some(name));
         for (type_name, ty) in &resolve.interfaces[id].types {
             let exported = matches!(resolve.types[*ty].kind, TypeDefKind::Resource)
                 || self.has_exported_resource(resolve, Type::Id(*ty));
 
             let mut generator = InterfaceGenerator::new(self, resolve, Some((id, name)), false);
 
-            if generator.generator.types.insert((package.clone(), *ty)) || exported {
+            if generator.generator.types.insert((go_package_name.clone(), *ty)) || exported {
                 generator.define_type(type_name, *ty);
             }
 
@@ -804,7 +804,7 @@ impl WorldGenerator for Go {
             } else {
                 &mut self.interfaces
             }
-            .entry(package.clone())
+            .entry(go_package_name.clone())
             .or_default()
             .extend(data);
         }
@@ -838,7 +838,7 @@ impl WorldGenerator for Go {
         types: &[(&str, TypeId)],
         _files: &mut Files,
     ) {
-        let package = self.interface_name(resolve, None);
+        let package = self.go_package_name(resolve, None);
         let mut generator = InterfaceGenerator::new(self, resolve, None, true);
         for (name, ty) in types {
             if generator.generator.types.insert((package.clone(), *ty)) {
@@ -1367,7 +1367,7 @@ func wasm_export_post_return_{name}(result {results}) {{
             let results = self.func_results(resolve, func, interface, false, &mut imports);
 
             self.export_interfaces
-                .entry(self.interface_name(resolve, interface))
+                .entry(self.go_package_name(resolve, interface))
                 .or_default()
                 .extend(InterfaceData {
                     code: format!(
@@ -1486,7 +1486,7 @@ func wasm_export_{name}({params}) {results} {{
                     &func.name,
                 );
 
-                let name = self.interface_name(resolve, interface);
+                let name = self.go_package_name(resolve, interface);
                 if in_import || !exported {
                     &mut self.interfaces
                 } else {
@@ -1512,7 +1512,7 @@ func wasm_export_{name}({params}) {results} {{
         })
     }
 
-    fn interface_name(&self, resolve: &Resolve, interface: Option<&WorldKey>) -> String {
+    fn go_package_name(&self, resolve: &Resolve, interface: Option<&WorldKey>) -> String {
         match interface {
             Some(WorldKey::Name(name)) => name.to_snake_case(),
             Some(WorldKey::Interface(id)) => {
@@ -1547,7 +1547,7 @@ func wasm_export_{name}({params}) {results} {{
         interface: Option<&WorldKey>,
         func: &Function,
     ) -> String {
-        let prefix = self.interface_name(resolve, interface);
+        let prefix = self.go_package_name(resolve, interface);
         let name = func.name.to_snake_case().replace('.', "_");
 
         format!("{prefix}_{name}")
@@ -1843,7 +1843,7 @@ for index := 0; index < int({length}); index++ {{
                 let name = func.item_name().to_upper_camel_case();
                 let package = format!(
                     "export_{}",
-                    self.generator.interface_name(resolve, self.interface)
+                    self.generator.go_package_name(resolve, self.interface)
                 );
 
                 let call = match &func.kind {