And fix exports

Signed-off-by: Ryan Levick <[email protected]>
bytecodealliance · Oct 9, 2023 · b4034fa · b4034fa
1 parent 4397ce3
commit b4034fa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/crates/rust/src/interface.rs b/crates/rust/src/interface.rs
@@ -404,16 +404,16 @@ impl InterfaceGenerator<'_> {
     pub fn generate_stub(
         &mut self,
         resource: Option<TypeId>,
-        pkg: Option<&PackageName>,
+        pkg: Option<(String, String)>,
         name: &str,
         in_interface: bool,
         funcs: &[&Function],
     ) {
-        let path = if let Some(pkg) = pkg {
+        let path = if let Some((namespace, pkg_name)) = pkg {
             format!(
                 "{}::{}::{}",
-                to_rust_ident(&pkg.namespace),
-                to_rust_ident(&pkg.name),
+                to_rust_ident(&namespace),
+                to_rust_ident(&pkg_name),
                 to_rust_ident(name),
             )
         } else {

diff --git a/crates/rust/src/lib.rs b/crates/rust/src/lib.rs
@@ -466,7 +466,7 @@ impl WorldGenerator for RustWasm {
                     WorldKey::Interface(id) => {
                         let interface = &resolve.interfaces[*id];
                         (
-                            Some(&resolve.packages[interface.package.unwrap()].name),
+                            Some(interface.package.unwrap()),
                             interface.name.as_ref().unwrap(),
                         )
                     }
@@ -481,6 +481,11 @@ impl WorldGenerator for RustWasm {
                         {
                             let mut gen =
                                 self.interface(Identifier::World(world_id), None, resolve, false);
+                            let pkg = pkg.map(|pid| {
+                                let namespace = resolve.packages[pid].name.namespace.clone();
+                                let package_module = name_package_module(resolve, pid);
+                                (namespace, package_module)
+                            });
                             gen.generate_stub(resource, pkg, name, true, &funcs);
                             let stub = gen.finish();
                             self.src.push_str(&stub);

diff --git a/tests/codegen/multiversion/root.wit b/tests/codegen/multiversion/root.wit
@@ -3,4 +3,5 @@ package foo:bar;
 world foo {
   import my:dep/a@0.1.0;
   import my:dep/a@0.2.0;
+  export my:dep/a@0.2.0;
 }