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

Adjust how distinct backtrace field is accessed

Browse source
This commit is contained in:
David Tolnay 2021-08-28 13:08:53 -07:00
parent ca33ed9bc7
commit 9b542cef8f
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 37 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

28
impl/src/expand.rs
View file

@ -129,21 +129,20 @@ fn impl_struct(input: Struct) -> TokenStream {
}
});
let from_impl = input.from_and_distinct_backtrace_fields().map(
|(from_field, backtrace_field)| {
let from = from_field.ty;
let body = from_initializer(from_field, backtrace_field);
quote! {
#[allow(unused_qualifications)]
impl #impl_generics std::convert::From<#from> for #ty #ty_generics #where_clause {
#[allow(deprecated)]
fn from(source: #from) -> Self {
#ty #body
}
let from_impl = input.from_field().map(|from_field| {
let backtrace_field = input.distinct_backtrace_field();
let from = from_field.ty;
let body = from_initializer(from_field, backtrace_field);
quote! {
#[allow(unused_qualifications)]
impl #impl_generics std::convert::From<#from> for #ty #ty_generics #where_clause {
#[allow(deprecated)]
fn from(source: #from) -> Self {
#ty #body
}
}
},
);
}
});
let error_trait = spanned_error_trait(input.original);
@ -342,7 +341,8 @@ fn impl_enum(input: Enum) -> TokenStream {
};
let from_impls = input.variants.iter().filter_map(|variant| {
let (from_field, backtrace_field) = variant.from_and_distinct_backtrace_fields()?;
let from_field = variant.from_field()?;
let backtrace_field = variant.distinct_backtrace_field();
let variant = &variant.ident;
let from = from_field.ty;
let body = from_initializer(from_field, backtrace_field);