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

Directly call source.provide instead of going through dyn error

Browse source
This commit is contained in:
David Tolnay 2022-09-04 13:49:31 -07:00
parent 2f093b5fbc
commit f924c251ec
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
impl/src/expand.rs
View file

@ -67,12 +67,12 @@ fn impl_struct(input: Struct) -> TokenStream {
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {source.span()=>
if let std::option::Option::Some(source) = &self.#source {
source.as_dyn_error().provide(#demand);
source.provide(#demand);
}
}
} else {
quote_spanned! {source.span()=>
self.#source.as_dyn_error().provide(#demand);
self.#source.provide(#demand);
}
};
let self_provide = if source == backtrace {
@ -89,7 +89,8 @@ fn impl_struct(input: Struct) -> TokenStream {
})
};
quote! {
use thiserror::__private::AsDynError;
#[allow(unused_imports)]
use std::error::Error as _;
#source_provide
#self_provide
}
@ -259,12 +260,12 @@ fn impl_enum(input: Enum) -> TokenStream {
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {source.span()=>
if let std::option::Option::Some(source) = #varsource {
source.as_dyn_error().provide(#demand);
source.provide(#demand);
}
}
} else {
quote_spanned! {source.span()=>
#varsource.as_dyn_error().provide(#demand);
#varsource.provide(#demand);
}
};
let self_provide = if type_is_option(backtrace_field.ty) {
@ -284,7 +285,8 @@ fn impl_enum(input: Enum) -> TokenStream {
#source: #varsource,
..
} => {
use thiserror::__private::AsDynError;
#[allow(unused_imports)]
use std::error::Error as _;
#source_provide
#self_provide
}
@ -298,17 +300,18 @@ fn impl_enum(input: Enum) -> TokenStream {
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {backtrace.span()=>
if let std::option::Option::Some(source) = #varsource {
source.as_dyn_error().provide(#demand);
source.provide(#demand);
}
}
} else {
quote_spanned! {backtrace.span()=>
#varsource.as_dyn_error().provide(#demand);
#varsource.provide(#demand);
}
};
quote! {
#ty::#ident {#backtrace: #varsource, ..} => {
use thiserror::__private::AsDynError;
#[allow(unused_imports)]
use std::error::Error as _;
#source_provide
}
}