mirrors/thiserror
1
0
Fork 0
mirror of https://github.com/dtolnay/thiserror.git synced 2025-04-07 06:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Handle backtrace coming from Option source field

Browse source
This commit is contained in:
David Tolnay 2021-08-28 13:41:57 -07:00
parent 2b37b9ed62
commit d49c5af10f
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
impl/src/expand.rs
View file

@ -201,9 +201,8 @@ fn impl_enum(input: Enum) -> TokenStream {
None None
}; };
let backtrace_method = let backtrace_method = if input.has_backtrace() {
if input.has_backtrace() { let arms = input.variants.iter().map(|variant| {
let arms = input.variants.iter().map(|variant| {
let ident = &variant.ident; let ident = &variant.ident;
match (variant.backtrace_field(), variant.source_field()) { match (variant.backtrace_field(), variant.source_field()) {
(Some(backtrace_field), Some(source_field)) (Some(backtrace_field), Some(source_field))
@ -245,8 +244,14 @@ fn impl_enum(input: Enum) -> TokenStream {
let backtrace = &backtrace_field.member; let backtrace = &backtrace_field.member;
if variant.source_field().map_or(false, |f| f.member == *backtrace) { if variant.source_field().map_or(false, |f| f.member == *backtrace) {
let varsource = quote!(source); let varsource = quote!(source);
let source_backtrace = quote_spanned! {backtrace.span()=> let source_backtrace = if type_is_option(backtrace_field.ty) {
#varsource.as_dyn_error().backtrace() quote_spanned! {backtrace.span()=>
#varsource.as_ref().and_then(|source| source.as_dyn_error().backtrace())
}
} else {
quote_spanned! {backtrace.span()=>
#varsource.as_dyn_error().backtrace()
}
}; };
quote! { quote! {
#ty::#ident {#backtrace: #varsource, ..} => { #ty::#ident {#backtrace: #varsource, ..} => {
@ -270,17 +275,17 @@ fn impl_enum(input: Enum) -> TokenStream {
}, },
} }
}); });
Some(quote! { Some(quote! {
fn backtrace(&self) -> std::option::Option<&std::backtrace::Backtrace> { fn backtrace(&self) -> std::option::Option<&std::backtrace::Backtrace> {
#[allow(deprecated)] #[allow(deprecated)]
match self { match self {
#(#arms)* #(#arms)*
}
} }
}) }
} else { })
None } else {
}; None
};
let display_impl = if input.has_display() { let display_impl = if input.has_display() {
let use_as_display = if input.variants.iter().any(|v| { let use_as_display = if input.variants.iter().any(|v| {