diff options
author | Douman <douman@gmx.se> | 2019-09-24 16:03:26 +0200 |
---|---|---|
committer | Douman <douman@gmx.se> | 2019-10-01 13:15:46 +0200 |
commit | a1d1eb5eb352f722eb8f7ed6be5963127da59b21 (patch) | |
tree | 4521812113ad38f14ac901aa2e0a9dac05fb5fec /tokio-macros | |
parent | 5efe31f2ed3c797e8055306a05faa3d7e786e7b6 (diff) |
macros: Allow arguments in non-main functions
Diffstat (limited to 'tokio-macros')
-rw-r--r-- | tokio-macros/src/lib.rs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tokio-macros/src/lib.rs b/tokio-macros/src/lib.rs index c7138552..07adfa0d 100644 --- a/tokio-macros/src/lib.rs +++ b/tokio-macros/src/lib.rs @@ -25,6 +25,10 @@ use quote::quote; /// - `single_thread` - Uses `current_thread`. /// - `multi_thread` - Uses multi-threaded runtime. Used by default. /// +/// ## Function arguments: +/// +/// Arguments are allowed for any functions aside from `main` which is special +/// /// ## Usage /// /// ### Select runtime @@ -57,6 +61,7 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream { let ret = &input.sig.output; let name = &input.sig.ident; + let inputs = &input.sig.inputs; let body = &input.block; let attrs = &input.attrs; @@ -65,7 +70,7 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream { return syn::Error::new_spanned(input.sig.fn_token, msg) .to_compile_error() .into(); - } else if !input.sig.inputs.is_empty() { + } else if name == "main" && !inputs.is_empty() { let msg = "the main function cannot accept arguments"; return syn::Error::new_spanned(&input.sig.inputs, msg) .to_compile_error() @@ -95,16 +100,14 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream { let result = match runtime { RuntimeType::Multi => quote! { #(#attrs)* - fn #name() #ret { - let mut rt = tokio::runtime::Runtime::new().unwrap(); - rt.block_on(async { #body }) + fn #name(#inputs) #ret { + tokio::runtime::Runtime::new().unwrap().block_on(async { #body }) } }, RuntimeType::Single => quote! { #(#attrs)* - fn #name() #ret { - let mut rt = tokio::runtime::current_thread::Runtime::new().unwrap(); - rt.block_on(async { #body }) + fn #name(#inputs) #ret { + tokio::runtime::current_thread::Runtime::new().unwrap().block_on(async { #body }) } }, RuntimeType::Auto => quote! { |