Skip to content

Allow generic arguments in enum variants #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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow generic arguments in enum variants #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
//! }
//! }
//! }
//!
//!
//! impl From<Cat> for Animal {
//! fn from(from: Cat) -> Self {
//! Animal::Cat(from)
Expand Down Expand Up @@ -250,7 +250,9 @@ fn implement_trait(
}
}

let match_block = gen_match_block(variants, |_| gen_static_method_call(quote! { #trait_ident }, sig));
let match_block = gen_match_block(variants, |_| {
gen_static_method_call(quote! { #trait_ident }, sig)
});
let tokens = quote! { #sig { #match_block } };
parse2::<ImplItem>(tokens).unwrap()
}
Expand Down Expand Up @@ -279,7 +281,7 @@ fn implement_raw(variants: &[WrapperVariant], pseudo_impl: &mut ItemImpl) {

let match_block = gen_match_block(variants, |variant| {
let ty = &variant.wrapped;
gen_static_method_call(quote! { #ty }, &method.sig)
gen_static_method_call(quote! { <#ty> }, &method.sig)
});
let body = quote! { { #match_block } };
method.block = syn::parse2(body).unwrap();
Expand Down Expand Up @@ -332,10 +334,13 @@ impl GenerateProxyImpl {
.get(&path)
.unwrap_or_else(|| panic!("missing declaration of trait `{}`", path))
}

fn impl_from_variants(&self, module: &mut ItemMod) {
let proxy_enum = &self.proxy_enum;
for WrapperVariant { variant, wrapped, .. } in self.get_variants() {
for WrapperVariant {
variant, wrapped, ..
} in self.get_variants()
{
let variant = &variant.ident;
let tokens = quote! {
impl From<#wrapped> for #proxy_enum {
Expand All @@ -345,7 +350,7 @@ impl GenerateProxyImpl {
}
};
let from_impl: ItemImpl = syn::parse2(tokens).unwrap();
module.content.as_mut().unwrap().1.push(from_impl.into());
module.content.as_mut().unwrap().1.push(from_impl.into());
}
}
}
Expand Down