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

wiggle GuestError: improve Display of InFunc, InDataField

Browse Source
This commit is contained in:
Pat Hickey
2021-03-23 22:03:25 -07:00
parent 6b2da3d299
commit 1151f630b8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,10 +139,12 @@ impl witx::Bindgen for Rust<'_> {
) { ) {
let rt = self.rt; let rt = self.rt;
let wrap_err = |location: &str| { let wrap_err = |location: &str| {
let modulename = self.module.name.as_str();
let funcname = self.funcname; let funcname = self.funcname;
quote! { quote! {
|e| { |e| {
#rt::GuestError::InFunc { #rt::GuestError::InFunc {
modulename: #modulename,
funcname: #funcname, funcname: #funcname,
location: #location, location: #location,
err: Box::new(#rt::GuestError::from(e)), err: Box::new(#rt::GuestError::from(e)),

5
crates/wiggle/src/error.rs
View File

@@ -19,14 +19,15 @@ pub enum GuestError {
BorrowCheckerOutOfHandles, BorrowCheckerOutOfHandles,
#[error("Slice length mismatch")] #[error("Slice length mismatch")]
SliceLengthsDiffer, SliceLengthsDiffer,
#[error("In func {funcname}:{location}:")] #[error("In func {modulename}::{funcname} at {location}: {err}")]
InFunc { InFunc {
modulename: &'static str,
funcname: &'static str, funcname: &'static str,
location: &'static str, location: &'static str,
#[source] #[source]
err: Box<GuestError>, err: Box<GuestError>,
}, },
#[error("In data {typename}.{field}:")] #[error("In data {typename}.{field}: {err}")]
InDataField { InDataField {
typename: String, typename: String,
field: String, field: String,