Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3123 from youknowone/derive-show-type

Browse Source 
derive shows type name when with trait fails
This commit is contained in:
Jim Fasarakis-Hilliard
2021-09-24 23:24:37 +03:00
committed by GitHub
parent 3bf488221c a723f7761b
commit c906ce6dbd
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
derive/src/pyclass.rs
View File

@@ -56,13 +56,12 @@ pub(crate) fn impl_pyimpl(
Item::Impl(mut imp) => {
extract_items_into_context(&mut context, imp.items.iter_mut());
let ty = &imp.self_ty;
let ExtractedImplAttrs {
with_impl,
flags,
with_slots,
} = extract_impl_attrs(attr)?;
let ty = &imp.self_ty;
} = extract_impl_attrs(attr, &Ident::new(&quote!(ty).to_string(), ty.span()))?;
let getset_impl = &context.getset_items;
let extend_impl = &context.impl_extend_items;
@@ -98,7 +97,7 @@ pub(crate) fn impl_pyimpl(
with_impl,
with_slots,
..
} = extract_impl_attrs(attr)?;
} = extract_impl_attrs(attr, &trai.ident)?;
let getset_impl = &context.getset_items;
let extend_impl = &context.impl_extend_items;
@@ -872,7 +871,10 @@ struct ExtractedImplAttrs {
flags: TokenStream,
}
fn extract_impl_attrs(attr: AttributeArgs) -> std::result::Result<ExtractedImplAttrs, Diagnostic> {
fn extract_impl_attrs(
attr: AttributeArgs,
item: &Ident,
) -> std::result::Result<ExtractedImplAttrs, Diagnostic> {
let mut withs = Vec::new();
let mut with_slots = Vec::new();
let mut flags = vec![quote! { ::rustpython_vm::slots::PyTpFlags::DEFAULT.bits() }];
@@ -899,14 +901,14 @@ fn extract_impl_attrs(attr: AttributeArgs) -> std::result::Result<ExtractedImplA
withs.push(quote_spanned! { path.span() =>
PyRef::<Self>::impl_extend_class(ctx, class);
});
with_slots.push(quote_spanned! { path.span() =>
with_slots.push(quote_spanned! { item.span() =>
PyRef::<Self>::extend_slots(slots);
});
} else {
withs.push(quote_spanned! { path.span() =>
<Self as #path>::__extend_py_class(ctx, class);
});
with_slots.push(quote_spanned! { path.span() =>
with_slots.push(quote_spanned! { item.span() =>
<Self as #path>::__extend_slots(slots);
});
}