fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-12 08:31:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix/doc-comment-runtimeerror

Browse Source
This commit is contained in:
Ivan Enderlin
2020-04-30 09:47:56 +02:00
committed by GitHub
parent 579d4564eb f48a4d924c
commit 3feaa7fd3f
7 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/runtime-core/src/import.rs
View File

@ -54,6 +54,7 @@ impl IsExport for Export {
/// n
/// }
/// ```
#[derive(Clone)]
pub struct ImportObject {
map: Arc<Mutex<HashMap<String, Box<dyn LikeNamespace + Send>>>>,
pub(crate) state_creator:
@ -158,15 +159,6 @@ impl ImportObject {
.and_then(|ns| f(ns))
}
/// Create a clone ref of this namespace.
pub fn clone_ref(&self) -> Self {
Self {
map: Arc::clone(&self.map),
state_creator: self.state_creator.clone(),
allow_missing_functions: false,
}
}
fn get_objects(&self) -> VecDeque<(String, String, Export)> {
let mut out = VecDeque::new();
let guard = self.map.lock().unwrap();

2
lib/runtime-core/src/instance.rs
View File

@ -103,7 +103,7 @@ impl Instance {
module,
inner,
exports,
import_object: imports.clone_ref(),
import_object: imports.clone(),
};
if let Some(start_index) = instance.module.info.start_func {