From ea9348bca0d8879762d8885e52eb6574f5fb0692 Mon Sep 17 00:00:00 2001 From: yjhmelody Date: Thu, 24 Nov 2022 16:42:46 +0800 Subject: [PATCH 1/5] feat: make Module::imports be `pub` --- crates/wasmi/src/module/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/wasmi/src/module/mod.rs b/crates/wasmi/src/module/mod.rs index a4b4716b2d..5bdde55d16 100644 --- a/crates/wasmi/src/module/mod.rs +++ b/crates/wasmi/src/module/mod.rs @@ -178,7 +178,7 @@ impl Module { } /// Returns an iterator over the imports of the [`Module`]. - pub(crate) fn imports(&self) -> ModuleImportsIter { + pub fn imports(&self) -> ModuleImportsIter { let len_imported_funcs = self.imports.len_funcs; let len_imported_globals = self.imports.len_globals; ModuleImportsIter { From 73e0fa77e718812f55b8aa4f4f640015d4a84b46 Mon Sep 17 00:00:00 2001 From: yjhmelody Date: Thu, 24 Nov 2022 17:01:40 +0800 Subject: [PATCH 2/5] export ModuleImportsIter --- crates/wasmi/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/wasmi/src/lib.rs b/crates/wasmi/src/lib.rs index 81ea76ac54..d7170b24d8 100644 --- a/crates/wasmi/src/lib.rs +++ b/crates/wasmi/src/lib.rs @@ -137,6 +137,7 @@ pub use self::{ Module, ModuleError, ModuleExportsIter, + ModuleImportsIter, Read, }, store::{AsContext, AsContextMut, Store, StoreContext, StoreContextMut}, From ee2dfac38d1c837bb6894f05d457b55b0d3ff33b Mon Sep 17 00:00:00 2001 From: yjhmelody Date: Thu, 24 Nov 2022 17:12:10 +0800 Subject: [PATCH 3/5] export more `import` related types --- crates/wasmi/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/wasmi/src/lib.rs b/crates/wasmi/src/lib.rs index d7170b24d8..473d0ef243 100644 --- a/crates/wasmi/src/lib.rs +++ b/crates/wasmi/src/lib.rs @@ -137,6 +137,8 @@ pub use self::{ Module, ModuleError, ModuleExportsIter, + ModuleImport, + ModuleImportType, ModuleImportsIter, Read, }, From 8b9317711e54654d73f6eb88346da8388ff8e8d5 Mon Sep 17 00:00:00 2001 From: yjhmelody Date: Thu, 24 Nov 2022 17:39:20 +0800 Subject: [PATCH 4/5] make `pub(crate)` for some methods in ModuleImport --- crates/wasmi/src/module/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/wasmi/src/module/mod.rs b/crates/wasmi/src/module/mod.rs index 5bdde55d16..ee07909a3d 100644 --- a/crates/wasmi/src/module/mod.rs +++ b/crates/wasmi/src/module/mod.rs @@ -293,7 +293,7 @@ pub struct ModuleImport<'a> { impl<'a> ModuleImport<'a> { /// Creates a new [`ModuleImport`]. - pub fn new(name: &'a ImportName, ty: T) -> Self + pub(crate) fn new(name: &'a ImportName, ty: T) -> Self where T: Into, { @@ -304,7 +304,7 @@ impl<'a> ModuleImport<'a> { } /// Returns the import name. - pub fn name(&self) -> &ImportName { + pub(crate) fn name(&self) -> &ImportName { self.name } From 8c5e2e69d13b4ed1e8a17ca61e03e5c508803484 Mon Sep 17 00:00:00 2001 From: yjhmelody Date: Thu, 24 Nov 2022 18:30:46 +0800 Subject: [PATCH 5/5] fix doc --- crates/wasmi/src/module/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/wasmi/src/module/mod.rs b/crates/wasmi/src/module/mod.rs index ee07909a3d..0833a01d90 100644 --- a/crates/wasmi/src/module/mod.rs +++ b/crates/wasmi/src/module/mod.rs @@ -340,6 +340,8 @@ pub enum ModuleImportType { /// [`Memory`]: [`crate::Memory`] Memory(MemoryType), /// An imported [`Global`]. + /// + /// [`Global`]: [`crate::Global`] Global(GlobalType), }