Skip to content

Fix provide impl for Location information #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JustusFluegel wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix provide impl for Location information #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b296f24
Print provide method even if only location and not backtrace is present
JustusFluegel Feb 7, 2026
01904c1
Allow #[location] on #[from] to forward provide like for #[backtrace]
JustusFluegel Feb 7, 2026
ed5e2c2
Fix provide impl for #[source] fields for #[location]
JustusFluegel Feb 7, 2026
41fd98a
Fix provide impl for enums for #[source] fields for #[location]
JustusFluegel Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
231 changes: 99 additions & 132 deletions impl/src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,15 @@ fn impl_struct(input: Struct) -> TokenStream {
}
});

let provide_method = input.backtrace_field().map(|backtrace_field| {
let backtrace_field = input.backtrace_field();
let location_field = input.location_field();
let provide_method = (backtrace_field.is_some() || location_field.is_some()).then(||{

let request = quote!(request);
let backtrace = &backtrace_field.member;
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.span()=>
if let ::core::option::Option::Some(source) = &self.#source {
source.thiserror_provide(#request);
}
}
} else {
quote_spanned! {source.span()=>
self.#source.thiserror_provide(#request);
}
};
let self_provide = if source == backtrace {

let backtrace_provide = if let Some(backtrace_field) = backtrace_field {
let backtrace = &backtrace_field.member;
if matches!(input.source_field(), Some(source_field) if &source_field.member == backtrace) {
None
} else if type_is_option(backtrace_field.ty) {
Some(quote! {
Expand All @@ -98,46 +90,51 @@ fn impl_struct(input: Struct) -> TokenStream {
Some(quote! {
#request.provide_ref::<::thiserror::__private::Backtrace>(&self.#backtrace);
})
};
let location_provide = if let Some(location_field) = input.location_field() {
let location = &location_field.member;

if type_is_option(location_field.ty) {
Some(quote! {
if let ::core::option::Option::Some(location) = &self.#location {
#request.provide_ref::<::core::panic::Location>(location);
}
})
} else {
Some(quote! {
#request.provide_ref::<::core::panic::Location>(&self.#location);
})
}
} else {
None
};
quote! {
use ::thiserror::__private::ThiserrorProvide as _;
#source_provide
#self_provide
#location_provide

}
} else if type_is_option(backtrace_field.ty) {
quote! {
if let ::core::option::Option::Some(backtrace) = &self.#backtrace {
#request.provide_ref::<::thiserror::__private::Backtrace>(backtrace);
}
} else { None };
let location_provide = if let Some(location_field) = location_field {
let location = &location_field.member;
if matches!(input.source_field(), Some(source_field) if &source_field.member == location) {
None
} else if type_is_option(location_field.ty) {
Some(quote! {
if let ::core::option::Option::Some(location) = &self.#location {
#request.provide_ref::<::core::panic::Location<'static>>(location);
}
})
} else {
Some(quote! {
#request.provide_ref::<::core::panic::Location<'static>>(&self.#location);
})

}
} else {
quote! {
#request.provide_ref::<::thiserror::__private::Backtrace>(&self.#backtrace);
} else { None };

let source_provide = if let Some(source_field) = input.source_field() {
let source = &source_field.member;
if type_is_option(source_field.ty) {
Some(quote_spanned! {source.span()=>
if let ::core::option::Option::Some(source) = &self.#source {
source.thiserror_provide(#request);
}
})
} else {
Some(quote_spanned! {source.span()=>
self.#source.thiserror_provide(#request);
})
}
};
} else { None };

quote! {
fn provide<'_request>(&'_request self, #request: &mut ::core::error::Request<'_request>) {
#body
use ::thiserror::__private::ThiserrorProvide as _;
#source_provide
#backtrace_provide
#location_provide
}
}

});

let mut display_implied_bounds = Set::new();
Expand Down Expand Up @@ -184,15 +181,11 @@ fn impl_struct(input: Struct) -> TokenStream {
let from_impl = input.from_field().map(|from_field| {
let span = from_field.attrs.from.unwrap().span;
let backtrace_field = input.distinct_backtrace_field();
let location_field = input.distinct_location_field();
let from = unoptional_type(from_field.ty);
let track_caller = input.location_field().map(|_| quote!(#[track_caller]));
let track_caller = location_field.as_ref().map(|_| quote!(#[track_caller]));
let source_var = Ident::new("source", span);
let body = from_initializer(
from_field,
backtrace_field,
&source_var,
input.location_field(),
);
let body = from_initializer(from_field, backtrace_field, &source_var, location_field);
let from_function = quote! {
#track_caller
fn from(#source_var: #from) -> Self {
Expand Down Expand Up @@ -287,109 +280,83 @@ fn impl_enum(input: Enum) -> TokenStream {
None
};

let provide_method = if input.has_backtrace() {
let provide_method = if input.has_backtrace() || input.has_location() {
let request = quote!(request);
let arms = input.variants.iter().map(|variant| {
let ident = &variant.ident;

let mut arm = vec![];
let mut head = vec![];
let source_field = variant.source_field();
let backtrace_field = variant.backtrace_field();
let location_field = variant.location_field();

if let Some((source_field, backtrace_field)) = variant
.backtrace_field()
.and_then(|b| variant.source_field().take().map(|s| (s, b)))
.and_then(|(s, b)| {
// TODO: replace with take_if upon stabilization

if s.member == b.member {
Some((s, b))
} else {
None
}
})
{
let backtrace_provide = if let Some(backtrace_field) = backtrace_field {
let backtrace = &backtrace_field.member;
let varsource = quote!(source);
let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {backtrace.span()=>
if let ::core::option::Option::Some(source) = #varsource {
source.thiserror_provide(#request);
}
}
if matches!(source_field, Some(source_field) if &source_field.member == backtrace) {
None
} else {
quote_spanned! {backtrace.span()=>
#varsource.thiserror_provide(#request);
}
};

head.push(quote! { #backtrace: #varsource });
arm.push(quote! { #source_provide });
} else {
if let Some(backtrace_field) = variant.backtrace_field() {
let backtrace = &backtrace_field.member;
let body = if type_is_option(backtrace_field.ty) {
quote! {
head.push(quote! { #backtrace: backtrace });
if type_is_option(backtrace_field.ty) {
Some(quote! {
if let ::core::option::Option::Some(backtrace) = backtrace {
#request.provide_ref::<::thiserror::__private::Backtrace>(backtrace);
}
}
})
} else {
quote! {
Some(quote! {
#request.provide_ref::<::thiserror::__private::Backtrace>(backtrace);
}
};
})
}
}
} else { None };

head.push(quote! { #backtrace: backtrace });
arm.push(quote! { #body });
let location_provide = if let Some(location_field) = location_field {
let location = &location_field.member;
if matches!(source_field, Some(source_field) if &source_field.member == location) {
None
} else {
head.push(quote! { #location: location });
if type_is_option(location_field.ty) {
Some(quote! {
if let ::core::option::Option::Some(location) = location {
#request.provide_ref::<::core::panic::Location<'static>>(location);
}
})
} else {
Some(quote! {
#request.provide_ref::<::core::panic::Location<'static>>(location);
})
}
}
} else { None };

if let Some(source_field) = variant.source_field() {
let source_provide = if let Some(source_field) = source_field {
if backtrace_field.is_some() || location_field.is_some() {
let source = &source_field.member;
let varsource = quote!(source);

let source_provide = if type_is_option(source_field.ty) {
quote_spanned! {source.span()=>
if let ::core::option::Option::Some(source) = #varsource {
head.push(quote! { #source: source });
if type_is_option(source_field.ty) {
Some(quote_spanned! {source.span()=>
if let ::core::option::Option::Some(source) = source {
source.thiserror_provide(#request);
}
}
})
} else {
quote_spanned! {source.span()=>
#varsource.thiserror_provide(#request);
}
};

head.push(quote! { #source: #varsource });
arm.push(quote! { #source_provide });
}
}

if let Some(location_field) = variant.location_field() {
let location = &location_field.member;

let location_provide = if type_is_option(location_field.ty) {
quote! {
if let ::core::option::Option::Some(location) = location {
#request.provide_ref::<::core::panic::Location>(location);
}
}
} else {
quote! {
#request.provide_ref::<::core::panic::Location>(location);
Some(quote_spanned! {source.span()=>
source.thiserror_provide(#request);
})
}
};

head.push(quote! { #location: location });
arm.push(quote! { #location_provide });
}
} else { None }
} else { None };

quote! {
#ty::#ident {
#(#head,)*
..
} => {
use thiserror::__private::ThiserrorProvide as _;
#(#arm)*
#source_provide
#backtrace_provide
#location_provide
}
}
});
Expand Down Expand Up @@ -474,7 +441,7 @@ fn impl_enum(input: Enum) -> TokenStream {
let from_field = variant.from_field()?;
let span = from_field.attrs.from.unwrap().span;
let backtrace_field = variant.distinct_backtrace_field();
let location_field = variant.location_field();
let location_field = variant.distinct_location_field();
let variant = &variant.ident;
let from = unoptional_type(from_field.ty);
let source_var = Ident::new("source", span);
Expand Down
32 changes: 23 additions & 9 deletions impl/src/prop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ impl Struct<'_> {

pub(crate) fn distinct_backtrace_field(&self) -> Option<&Field> {
let backtrace_field = self.backtrace_field()?;
distinct_backtrace_field(backtrace_field, self.from_field())
field_if_distinct_from(backtrace_field, self.from_field())
}

pub(crate) fn distinct_location_field(&self) -> Option<&Field> {
let location_field = self.location_field()?;
field_if_distinct_from(location_field, self.from_field())
}
}

Expand All @@ -42,6 +47,12 @@ impl Enum<'_> {
.any(|variant| variant.backtrace_field().is_some())
}

pub(crate) fn has_location(&self) -> bool {
self.variants
.iter()
.any(|variant| variant.location_field().is_some())
}

pub(crate) fn has_display(&self) -> bool {
self.attrs.display.is_some()
|| self.attrs.transparent.is_some()
Expand Down Expand Up @@ -76,7 +87,12 @@ impl Variant<'_> {

pub(crate) fn distinct_backtrace_field(&self) -> Option<&Field> {
let backtrace_field = self.backtrace_field()?;
distinct_backtrace_field(backtrace_field, self.from_field())
field_if_distinct_from(backtrace_field, self.from_field())
}

pub(crate) fn distinct_location_field(&self) -> Option<&Field> {
let location_field = self.location_field()?;
field_if_distinct_from(location_field, self.from_field())
}
}

Expand Down Expand Up @@ -153,16 +169,14 @@ fn location_field<'a, 'b>(fields: &'a [Field<'b>]) -> Option<&'a Field<'b>> {
}

// The #[backtrace] field, if it is not the same as the #[from] field.
fn distinct_backtrace_field<'a, 'b>(
backtrace_field: &'a Field<'b>,
from_field: Option<&Field>,
fn field_if_distinct_from<'a, 'b>(
input_field: &'a Field<'b>,
check_against: Option<&Field>,
) -> Option<&'a Field<'b>> {
if from_field.map_or(false, |from_field| {
from_field.member == backtrace_field.member
}) {
if check_against.map_or(false, |from_field| from_field.member == input_field.member) {
None
} else {
Some(backtrace_field)
Some(input_field)
}
}

Expand Down