Start9/rpc-toolkit
2
0
Fork 0
mirror of https://github.com/Start9Labs/rpc-toolkit.git synced 2026-03-26 02:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

give matches on display

Browse Source
This commit is contained in:
Aiden McClelland
2021-05-21 11:43:48 -06:00
parent f3cd9f5e86
commit f5217d0e53
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rpc-toolkit-macro-internals/src/command/build.rs
View File

@@ -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))
}
}
}

2
rpc-toolkit/src/command_helpers.rs
View File

@@ -123,6 +123,6 @@ pub fn default_stdin_parser<T: FromStr<Err = E>, E: Display>(
})
}
pub fn default_display<T: Display>(t: T) {
pub fn default_display<T: Display>(t: T, _: &ArgMatches<'_>) {
println!("{}", t)
}