fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-13 00:51:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into c-api-cargo-singlepass-feature

Browse Source
This commit is contained in:
Yaron Wittenstein
2019-08-22 11:02:57 +03:00
parent 9e51c39144 31365510ed
commit e6387ec7c3
194 changed files with 28331 additions and 5684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/runtime-c-api/src/error.rs
View File

@ -8,7 +8,7 @@ use std::ptr;
use std::slice;
thread_local! {
static LAST_ERROR: RefCell<Option<Box<Error>>> = RefCell::new(None);
static LAST_ERROR: RefCell<Option<Box<dyn Error>>> = RefCell::new(None);
}
pub fn update_last_error<E: Error + 'static>(err: E) {
@ -18,7 +18,7 @@ pub fn update_last_error<E: Error + 'static>(err: E) {
}
/// Retrieve the most recent error, clearing it in the process.
pub(crate) fn take_last_error() -> Option<Box<Error>> {
pub(crate) fn take_last_error() -> Option<Box<dyn Error>> {
LAST_ERROR.with(|prev| prev.borrow_mut().take())
}

2
lib/runtime-c-api/wasmer.h
View File

@ -555,7 +555,7 @@ void wasmer_module_destroy(wasmer_module_t *module);
/**
* Given:
* A prepared `wasmer svm` import-object
* A prepared `wasmer` import-object
* A compiled wasmer module
* Instantiates a wasmer instance
*/

2
lib/runtime-c-api/wasmer.hh
View File

@ -438,7 +438,7 @@ wasmer_result_t wasmer_module_deserialize(wasmer_module_t **module,
void wasmer_module_destroy(wasmer_module_t *module);
/// Given:
/// A prepared `wasmer svm` import-object
/// A prepared `wasmer` import-object
/// A compiled wasmer module
/// Instantiates a wasmer instance
wasmer_result_t wasmer_module_import_instantiate(wasmer_instance_t **instance,