Skip to content
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

Properly handle functions that do not return RPITs #44

Merged
merged 10 commits into from
Feb 3, 2025
Merged

Properly handle functions that do not return RPITs #44

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f7b0cb8
Remove impl_trait_fns_iter and just add a filtering fn
spastorino Jan 31, 2025
712762d
Inline expand_trait_async_fns_to_dyn in mk_erased_trait
spastorino Jan 31, 2025
39e526b
Add small comment explaining why this is there
spastorino Jan 31, 2025
bb91066
Inline impl_item fn
spastorino Jan 31, 2025
27a2128
Extract dyn_compatible_items fn
spastorino Jan 31, 2025
5f918ca
Extract trait_item_erased_name
spastorino Jan 31, 2025
af52e0b
Extract expand_fn
spastorino Jan 31, 2025
0fbf140
Make mk_erased_trait_blanket_impl start from item_trait
spastorino Jan 31, 2025
cb6ab01
Properly handle functions that do not return RPITs
spastorino Jan 31, 2025
804e762
Apply suggestions from code review
tmandry Feb 3, 2025
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
Prev Previous commit
Next Next commit
Inline impl_item fn
  • Loading branch information
@spastorino
spastorino committed Jan 31, 2025
commit bb910669d444e62568a7467267c941c0bb375034
148 changes: 67 additions & 81 deletions dynosaur_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,40 +217,39 @@ fn mk_erased_trait_blanket_impl(trait_ident: &Ident, erased_trait: &ItemTrait) -
let erased_trait_ident = &erased_trait.ident;
let (_, trait_generics, _) = &erased_trait.generics.split_for_impl();
let items = erased_trait.items.iter().map(|item| {
impl_item(
item,
|TraitItemConst {
ident,
generics,
ty,
..
}| {
match item {
TraitItem::Const(TraitItemConst {
ident,
generics,
ty,
..
}) => {
quote! {
const #ident #generics: #ty = <Self as #trait_ident #trait_generics>::#ident;
}
},
|TraitItemFn {
sig,
..
}| {
let (receiver, mut args) = invoke_fn_args(sig);
if receiver.is_some() {
args.insert(0, quote!(self));
}
let ident = &sig.ident;
quote! {
#sig {
Box::pin(<Self as #trait_ident #trait_generics>::#ident(#(#args),*))
}
}
},
|TraitItemType {
ident, generics, .. }| {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
quote! {
type #ident #impl_generics = <Self as #trait_ident #trait_generics>:: #ident #ty_generics #where_clause;
}
TraitItem::Fn(trait_item_fn) => {
let sig = &trait_item_fn.sig;
let (receiver, mut args) = invoke_fn_args(sig);
if receiver.is_some() {
args.insert(0, quote!(self));
}
let ident = &sig.ident;
quote! {
#sig {
Box::pin(<Self as #trait_ident #trait_generics>::#ident(#(#args),*))
}
})
}
}
TraitItem::Type(TraitItemType {
ident, generics, .. }) => {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
quote! {
type #ident #impl_generics = <Self as #trait_ident #trait_generics>:: #ident #ty_generics #where_clause;
}
}
_ => Error::new_spanned(item, "unsupported item type").into_compile_error(),
}
});
let blanket_bound: TypeParam = parse_quote!(DYNOSAUR: #trait_ident #trait_generics);
let blanket = &blanket_bound.ident.clone();
Expand All @@ -267,20 +266,6 @@ fn mk_erased_trait_blanket_impl(trait_ident: &Ident, erased_trait: &ItemTrait) -
}
}

fn impl_item(
item: &TraitItem,
item_const_fn: impl Fn(&TraitItemConst) -> TokenStream,
item_fn_fn: impl Fn(&TraitItemFn) -> TokenStream,
item_type_fn: impl Fn(&TraitItemType) -> TokenStream,
) -> TokenStream {
match item {
TraitItem::Const(trait_item_const) => item_const_fn(trait_item_const),
TraitItem::Fn(trait_item_fn) => item_fn_fn(trait_item_fn),
TraitItem::Type(trait_item_type) => item_type_fn(trait_item_type),
_ => Error::new_spanned(item, "unsupported item type").into_compile_error(),
}
}

fn invoke_fn_args(sig: &Signature) -> (Option<&Receiver>, Vec<TokenStream>) {
let mut receiver = None;
let mut args = Vec::new();
Expand Down Expand Up @@ -368,53 +353,54 @@ fn mk_dyn_struct_impl_item(struct_ident: &Ident, item_trait: &ItemTrait) -> Toke
let (_, trait_generics, where_clause) = &item_trait.generics.split_for_impl();

let items = item_trait.items.iter().map(|item| {
impl_item(item,
|TraitItemConst {
match item {
TraitItem::Const(TraitItemConst {
ident,
generics,
ty,
..
}| {
}) => {
quote! {
const #ident #generics: #ty = <Self as #item_trait_ident #trait_generics>::#ident;
}
},
|TraitItemFn {
sig,
..
}| {
let ident = &sig.ident;
let mut sig = sig.clone();
let (_, args) = invoke_fn_args(&sig);
let (ret_arrow, ret) = expand_ret_ty(&sig);
sig.output = parse_quote! { #ret_arrow impl #ret };
remove_fn_asyncness(&mut sig);

if has_where_self_sized(&mut sig) {
quote! {
#sig {
let fut: ::core::pin::Pin<Box<dyn #ret + 'static>> = unreachable!();
fut
}
}
} else {
quote! {
#sig {
let fut: ::core::pin::Pin<Box<dyn #ret + '_>> = self.ptr.#ident(#(#args),*);
let fut: ::core::pin::Pin<Box<dyn #ret + 'static>> = unsafe { ::core::mem::transmute(fut) };
fut
}
}
}
},
|TraitItemType {
ident, generics, .. }| {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
}
TraitItem::Fn(TraitItemFn {
sig,
..
}) => {
let ident = &sig.ident;
let mut sig = sig.clone();
let (_, args) = invoke_fn_args(&sig);
let (ret_arrow, ret) = expand_ret_ty(&sig);
sig.output = parse_quote! { #ret_arrow impl #ret };
remove_fn_asyncness(&mut sig);

if has_where_self_sized(&mut sig) {
quote! {
#sig {
let fut: ::core::pin::Pin<Box<dyn #ret + 'static>> = unreachable!();
fut
}
}
} else {
quote! {
type #ident #impl_generics = #ident #ty_generics #where_clause;
#sig {
let fut: ::core::pin::Pin<Box<dyn #ret + '_>> = self.ptr.#ident(#(#args),*);
let fut: ::core::pin::Pin<Box<dyn #ret + 'static>> = unsafe { ::core::mem::transmute(fut) };
fut
}
}
}
)
}
TraitItem::Type(TraitItemType {
ident, generics, .. }) => {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
quote! {
type #ident #impl_generics = #ident #ty_generics #where_clause;
}
}
_ => Error::new_spanned(item, "unsupported item type").into_compile_error(),
}
});

let StructTraitParams {
Expand Down