From f5217d0e53b30ba519789429e276927f2a877d0c Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Fri, 21 May 2021 11:43:48 -0600 Subject: [PATCH] give matches on display --- rpc-toolkit-macro-internals/src/command/build.rs | 10 +++++----- rpc-toolkit/src/command_helpers.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpc-toolkit-macro-internals/src/command/build.rs b/rpc-toolkit-macro-internals/src/command/build.rs index 4859549..272e927 100644 --- a/rpc-toolkit-macro-internals/src/command/build.rs +++ b/rpc-toolkit-macro-internals/src/command/build.rs @@ -618,7 +618,7 @@ fn cli_handler( }; let res = rt_ref.block_on(rpc_toolkit_prelude::call_remote(ctx, method.as_ref(), params, return_ty))?; - Ok(#display(res.result?)) + Ok(#display(res.result?, matches)) } } } @@ -634,11 +634,11 @@ fn cli_handler( }; let display_res = if let Some(display_fn) = &opt.display { quote! { - #display_fn(#invocation) + #display_fn(#invocation, matches) } } else { quote! { - rpc_toolkit_prelude::default_display(#invocation) + rpc_toolkit_prelude::default_display(#invocation, matches) } }; let rt_action = if opt.is_async { @@ -726,7 +726,7 @@ fn cli_handler( } }; quote! { - Ok(#display(#self_impl)), + Ok(#display(#self_impl, matches)), } } (Some(self_impl), ExecutionContext::Standard) => { @@ -760,7 +760,7 @@ fn cli_handler( }; let res = rt_ref.block_on(rpc_toolkit_prelude::call_remote(ctx, method.as_ref(), params, return_ty))?; - Ok(#display(res.result?)) + Ok(#display(res.result?, matches)) } } } diff --git a/rpc-toolkit/src/command_helpers.rs b/rpc-toolkit/src/command_helpers.rs index a4c43bc..23e8eca 100644 --- a/rpc-toolkit/src/command_helpers.rs +++ b/rpc-toolkit/src/command_helpers.rs @@ -123,6 +123,6 @@ pub fn default_stdin_parser, E: Display>( }) } -pub fn default_display(t: T) { +pub fn default_display(t: T, _: &ArgMatches<'_>) { println!("{}", t) }