Merge branch 'pch/wiggle_trapping' into pch/wasi_common_cap_std

2021-01-07 14:10:59 -08:00
parent c2004001cb b149a03d5d
commit 13cd7a4a8e
25 changed files with 183 additions and 142 deletions
--- a/crates/wasi-nn/src/witx.rs
+++ b/crates/wasi-nn/src/witx.rs
@@ -22,7 +22,7 @@ impl types::GuestErrorConversion for WasiNnCtx {
 }

 impl<'a> types::UserErrorConversion for WasiNnCtx {
-    fn errno_from_wasi_nn_error(&self, e: WasiNnError) -> Result<Errno, String> {
+    fn errno_from_wasi_nn_error(&self, e: WasiNnError) -> Result<Errno, wiggle::Trap> {
        eprintln!("Host error: {:?}", e);
        match e {
            WasiNnError::OpenvinoError(_) => unimplemented!(),