Remove function to get all exports

wasmerio · Mar 9, 2019 · 39a1658 · 39a1658
1 parent d16a650
commit 39a1658
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/lib/runtime-core/src/import.rs b/lib/runtime-core/src/import.rs
@@ -31,7 +31,6 @@ impl<'a> Iterator for ExportIter<'a> {
 }
 
 pub trait LikeNamespace {
-    fn get_all_exports(&self) -> HashMap<String, Export>;
     fn get_export(&self, name: &str) -> Option<Export>;
     fn export_names<'a>(&'a self) -> Box<dyn Iterator<Item = &'a str> + 'a>;
 }
@@ -162,18 +161,18 @@ impl ImportObject {
                 (Some(namespace_a), Some(namespace_b)) => {
                     // Create a combined namespace
                     let mut namespace_ab = Namespace::new();
-                    let mut exports_a = namespace_a.get_all_exports();
-                    let mut exports_b = namespace_b.get_all_exports();
+                    let mut exports_a: HashMap<&str, Export> = namespace_a.into_iter().collect();
+                    let mut exports_b: HashMap<&str, Export> = namespace_b.into_iter().collect();
                     // Import from A will win over B
                     namespace_ab
                         .map
                         .extend(exports_b.drain().map(|(export_name, export)| {
-                            (export_name, Box::new(export) as Box<IsExport>)
+                            (export_name.to_string(), Box::new(export) as Box<IsExport>)
                         }));
                     namespace_ab
                         .map
                         .extend(exports_a.drain().map(|(export_name, export)| {
-                            (export_name, Box::new(export) as Box<IsExport>)
+                            (export_name.to_string(), Box::new(export) as Box<IsExport>)
                         }));
                     merged_imports.map.insert(name, Box::new(namespace_ab));
                 }
@@ -229,13 +228,6 @@ impl Namespace {
 }
 
 impl LikeNamespace for Namespace {
-    fn get_all_exports(&self) -> HashMap<String, Export> {
-        self.map
-            .iter()
-            .map(|(name, is_export)| (name.to_string(), is_export.to_export()))
-            .collect()
-    }
-
     fn get_export(&self, name: &str) -> Option<Export> {
         self.map.get(name).map(|is_export| is_export.to_export())
     }

diff --git a/lib/runtime-core/src/instance.rs b/lib/runtime-core/src/instance.rs
@@ -423,18 +423,6 @@ impl InstanceInner {
 }
 
 impl LikeNamespace for Instance {
-    fn get_all_exports(&self) -> HashMap<String, Export> {
-        self.module
-            .info
-            .exports
-            .iter()
-            .map(|(name, export_index)| {
-                let export = self.inner.get_export_from_index(&self.module, export_index);
-                (name.to_string(), export)
-            })
-            .collect()
-    }
-
     fn get_export(&self, name: &str) -> Option<Export> {
         let export_index = self.module.info.exports.get(name)?;