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

Merge pull request #404 from dtolnay/fromfn

Browse source 
Unspan From impl contents
This commit is contained in:
David Tolnay 2024-12-21 10:25:40 -08:00 • committed by GitHub
commit 0a0516db73
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
impl/src/expand.rs
View file

@ -169,12 +169,15 @@ fn impl_struct(input: Struct) -> TokenStream {
let from = unoptional_type(from_field.ty); let from = unoptional_type(from_field.ty);
let source_var = Ident::new("source", span); let source_var = Ident::new("source", span);
let body = from_initializer(from_field, backtrace_field, &source_var); let body = from_initializer(from_field, backtrace_field, &source_var);
let from_function = quote! {
fn from(#source_var: #from) -> Self {
#ty #body
}
};
let from_impl = quote_spanned! {span=> let from_impl = quote_spanned! {span=>
#[automatically_derived] #[automatically_derived]
impl #impl_generics ::core::convert::From<#from> for #ty #ty_generics #where_clause { impl #impl_generics ::core::convert::From<#from> for #ty #ty_generics #where_clause {
fn from(#source_var: #from) -> Self { #from_function
#ty #body
}
} }
}; };
Some(quote! { Some(quote! {
@ -436,12 +439,15 @@ fn impl_enum(input: Enum) -> TokenStream {
let from = unoptional_type(from_field.ty); let from = unoptional_type(from_field.ty);
let source_var = Ident::new("source", span); let source_var = Ident::new("source", span);
let body = from_initializer(from_field, backtrace_field, &source_var); let body = from_initializer(from_field, backtrace_field, &source_var);
let from_function = quote! {
fn from(#source_var: #from) -> Self {
#ty::#variant #body
}
};
let from_impl = quote_spanned! {span=> let from_impl = quote_spanned! {span=>
#[automatically_derived] #[automatically_derived]
impl #impl_generics ::core::convert::From<#from> for #ty #ty_generics #where_clause { impl #impl_generics ::core::convert::From<#from> for #ty #ty_generics #where_clause {
fn from(#source_var: #from) -> Self { #from_function
#ty::#variant #body
}
} }
}; };
Some(quote! { Some(quote! {