T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add TryFromIntError to GuestError and fix error handling

Browse Source 
While working on the full WASI spec, it turned out that we need two
tweaks to `GuestError`:
1. we need to support conversion from `TryFromIntError`, and
2. we need to invoke `e.into()` when unwrapping the result of `try_into()`
   in auto-implementation of raw interface functions.

Both problems seem to originate for "transparent" builtin types since
for those we don't really provide a `TryFrom` implementation like for
compound types, e.g., enums, flags, etc.
This commit is contained in:
Jakub Konka
2020-02-27 11:10:30 +01:00
committed by Jakub Konka
parent 90182bc5da
commit ed1d5180ef
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/generate/src/funcs.rs
View File

@@ -62,7 +62,7 @@ pub fn define_func(names: &Names, func: &witx::InterfaceFunc) -> TokenStream {
}; };
let err_typename = names.type_ref(&tref, anon_lifetime()); let err_typename = names.type_ref(&tref, anon_lifetime());
quote! { quote! {
let e = wiggle_runtime::GuestError::InFunc { funcname: #funcname, location: #location, err: Box::new(e) }; let e = wiggle_runtime::GuestError::InFunc { funcname: #funcname, location: #location, err: Box::new(e.into()) };
let err: #err_typename = wiggle_runtime::GuestErrorType::from_error(e, ctx); let err: #err_typename = wiggle_runtime::GuestErrorType::from_error(e, ctx);
return #abi_ret::from(err); return #abi_ret::from(err);
} }

6
crates/runtime/src/error.rs
View File

@@ -27,6 +27,8 @@ pub enum GuestError {
#[source] #[source]
err: Box<GuestError>, err: Box<GuestError>,
}, },
#[error("Invalid UTF-8 encountered")] #[error("Invalid UTF-8 encountered: {0:?}")]
InvalidUtf8(#[from] std::str::Utf8Error), InvalidUtf8(#[from] ::std::str::Utf8Error),
#[error("Int conversion error: {0:?}")]
TryFromIntError(#[from] ::std::num::TryFromIntError),
} }