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

Rename MemberUnraw::member_span() to just span()

Browse source
This commit is contained in:
David Tolnay 2024-11-04 17:11:43 -05:00
parent 9116fdb8ea
commit e015360076
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
impl/src/expand.rs
View file

@ -75,7 +75,7 @@ fn impl_struct(input: Struct) -> TokenStream {
error_inferred_bounds.insert(ty, quote!(std::error::Error + 'static));
}
let asref = if type_is_option(source_field.ty) {
Some(quote_spanned!(source.member_span()=> .as_ref()?))
Some(quote_spanned!(source.span()=> .as_ref()?))
} else {
None
};
@ -103,13 +103,13 @@ fn impl_struct(input: Struct) -> TokenStream {
let body = if let Some(source_field) = input.source_field() {
let source = &source_field.member;
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {source.member_span()=>
quote_spanned! {source.span()=>
if let ::core::option::Option::Some(source) = &self.#source {
source.thiserror_provide(#request);
}
}
} else {
quote_spanned! {source.member_span()=>
quote_spanned! {source.span()=>
self.#source.thiserror_provide(#request);
}
};
@ -252,7 +252,7 @@ fn impl_enum(input: Enum) -> TokenStream {
error_inferred_bounds.insert(ty, quote!(std::error::Error + 'static));
}
let asref = if type_is_option(source_field.ty) {
Some(quote_spanned!(source.member_span()=> .as_ref()?))
Some(quote_spanned!(source.span()=> .as_ref()?))
} else {
None
};
@ -294,13 +294,13 @@ fn impl_enum(input: Enum) -> TokenStream {
let source = &source_field.member;
let varsource = quote!(source);
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {source.member_span()=>
quote_spanned! {source.span()=>
if let ::core::option::Option::Some(source) = #varsource {
source.thiserror_provide(#request);
}
}
} else {
quote_spanned! {source.member_span()=>
quote_spanned! {source.span()=>
#varsource.thiserror_provide(#request);
}
};
@ -333,13 +333,13 @@ fn impl_enum(input: Enum) -> TokenStream {
let backtrace = &backtrace_field.member;
let varsource = quote!(source);
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {backtrace.member_span()=>
quote_spanned! {backtrace.span()=>
if let ::core::option::Option::Some(source) = #varsource {
source.thiserror_provide(#request);
}
}
} else {
quote_spanned! {backtrace.member_span()=>
quote_spanned! {backtrace.span()=>
#varsource.thiserror_provide(#request);
}
};