Skip to content
Closed
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions riker-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,28 @@ pub fn actor(
let types = syn::parse_macro_input!(attr as MsgTypes);

let menum = types.enum_stream(&name);
let intos = intos(&name, &types);
let froms = froms(&name, &types);
let rec = receive(&ast.ident, &ast.generics, &name, &types);

let input: TokenStream = input.into();
let gen = quote! {
#input
#menum
#intos
#froms

#rec
};

gen.into()
}

fn intos(name: &Ident, types: &MsgTypes) -> TokenStream {
let intos = types
fn froms(name: &Ident, types: &MsgTypes) -> TokenStream {
let froms = types
.types
.iter()
.map(|t| impl_into(&name, &t.name, &t.mtype));
.map(|t| impl_from(&name, &t.name, &t.mtype));
quote! {
#(#intos)*
#(#froms)*
}
}

Expand Down Expand Up @@ -135,11 +135,11 @@ fn receive(aname: &Ident, gen: &Generics, name: &Ident, types: &MsgTypes) -> Tok
}
}

fn impl_into(name: &Ident, vname: &Ident, ty: &TypePath) -> TokenStream {
fn impl_from(name: &Ident, vname: &Ident, ty: &TypePath) -> TokenStream {
quote! {
impl Into<#name> for #ty {
fn into(self) -> #name {
#name::#vname(self)
impl From<#ty> for #name {
fn from(obj: #ty) -> #name {
#name::#vname(obj)
}
}
}
Expand Down