Start9/rpc-toolkit
2
0
Fork 0
mirror of https://github.com/Start9Labs/rpc-toolkit.git synced 2026-03-30 12:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix CustomDisplayFn

Browse Source
This commit is contained in:
Aiden McClelland
2024-01-04 14:58:51 -07:00
parent 3df960f8be
commit 6e1046222f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rpc-toolkit/src/handler/adapters.rs
View File

@@ -454,19 +454,26 @@ where
impl<Context, F, H> CliBindings for CustomDisplayFn<Context, F, H> impl<Context, F, H> CliBindings for CustomDisplayFn<Context, F, H>
where where
Context: IntoContext, Context: IntoContext,
H: CliBindings, H: HandlerTypes,
H::Params: FromArgMatches + CommandFactory + Serialize,
F: Fn(HandleArgs<Context, H>, H::Ok) -> Result<(), H::Err> + Send + Sync + Clone + 'static, F: Fn(HandleArgs<Context, H>, H::Ok) -> Result<(), H::Err> + Send + Sync + Clone + 'static,
{ {
type Context = Context; type Context = Context;
fn cli_command(&self, ctx_ty: TypeId) -> clap::Command { fn cli_command(&self, _: TypeId) -> clap::Command {
self.handler.cli_command(ctx_ty) H::Params::command()
} }
fn cli_parse( fn cli_parse(
&self, &self,
matches: &clap::ArgMatches, matches: &clap::ArgMatches,
ctx_ty: TypeId, _: TypeId,
) -> Result<(VecDeque<&'static str>, Value), clap::Error> { ) -> Result<(VecDeque<&'static str>, Value), clap::Error> {
self.handler.cli_parse(matches, ctx_ty) Self::Params::from_arg_matches(matches).and_then(|a| {
Ok((
VecDeque::new(),
imbl_value::to_value(&a)
.map_err(|e| clap::Error::raw(clap::error::ErrorKind::ValueValidation, e))?,
))
})
} }
fn cli_display( fn cli_display(
&self, &self,