fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/invoke-arg-parsing

Browse Source
This commit is contained in:
Syrus Akbary 2019-12-10 17:55:24 -08:00 committed by GitHub
commit 92fcce2c21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## **[Unreleased]** ## **[Unreleased]**
- [#1054](https://github.com/wasmerio/wasmer/pull/1054) Improve `--invoke` output in Wasmer CLI
- [#1053](https://github.com/wasmerio/wasmer/pull/1053) For RuntimeError and breakpoints, use Box<Any + Send> instead of Box<Any>. - [#1053](https://github.com/wasmerio/wasmer/pull/1053) For RuntimeError and breakpoints, use Box<Any + Send> instead of Box<Any>.
- [#1052](https://github.com/wasmerio/wasmer/pull/1052) Fix minor panic and improve Error handling in singlepass backend. - [#1052](https://github.com/wasmerio/wasmer/pull/1052) Fix minor panic and improve Error handling in singlepass backend.
- [#1050](https://github.com/wasmerio/wasmer/pull/1050) Attach C & C++ headers to releases. - [#1050](https://github.com/wasmerio/wasmer/pull/1050) Attach C & C++ headers to releases.

4
src/bin/wasmer.rs
View File

@ -491,7 +491,7 @@ fn execute_wasi(
.map_err(|e| format!("Invoke failed: {:?}", e))? .map_err(|e| format!("Invoke failed: {:?}", e))?
.call(&args) .call(&args)
.map_err(|e| format!("Calling invoke fn failed: {:?}", e))?; .map_err(|e| format!("Calling invoke fn failed: {:?}", e))?;
println!("{} returned {:?}", invoke_fn, invoke_result); println!("{}({:?}) returned {:?}", invoke_fn, args, invoke_result);
return Ok(()); return Ok(());
} else { } else {
result = start.call(); result = start.call();
@ -828,7 +828,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
.map_err(|e| format!("{:?}", e))? .map_err(|e| format!("{:?}", e))?
.call(&args) .call(&args)
.map_err(|e| format!("{:?}", e))?; .map_err(|e| format!("{:?}", e))?;
println!("main() returned: {:?}", result); println!("{}({:?}) returned {:?}", invoke_fn, args, result);
} }
} }