From 55e61b72e69d0df02dc2994bd6fe96b0907972f1 Mon Sep 17 00:00:00 2001 From: BratSinot Date: Tue, 27 Jul 2021 13:24:42 +0300 Subject: [PATCH] Use trait From instead of Into. --- riker-macros/src/lib.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/riker-macros/src/lib.rs b/riker-macros/src/lib.rs index 90cdd5ab..9098a2a5 100644 --- a/riker-macros/src/lib.rs +++ b/riker-macros/src/lib.rs @@ -84,14 +84,14 @@ 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 }; @@ -99,13 +99,13 @@ pub fn actor( 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)* } } @@ -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) } } }