Start9/rpc-toolkit
2
0
Fork 0
mirror of https://github.com/Start9Labs/rpc-toolkit.git synced 2026-04-01 21:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump dependencies

Browse Source
This commit is contained in:
Aiden McClelland
2022-03-08 16:25:07 -07:00
parent b4d19d71e0
commit f2126d09f0
8 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,10 @@ fn build_app(name: LitStr, opt: &mut Options, params: &mut [ParamType]) -> Token
return None;
}
let name = arg.name.clone().unwrap();
let name_str = arg.rename.clone().unwrap_or_else(|| LitStr::new(&name.to_string(), name.span()));
let name_str = arg
.rename
.clone()
.unwrap_or_else(|| LitStr::new(&name.to_string(), name.span()));
let help = arg.help.clone().into_iter();
let short = arg.short.clone().into_iter();
let long = arg.long.clone().into_iter();
@@ -315,7 +318,7 @@ fn build_app(name: LitStr, opt: &mut Options, params: &mut [ParamType]) -> Token
};
Some(quote! {
{
let mut arg = ::rpc_toolkit::command_helpers::prelude::Arg::with_name(#name_str);
let mut arg = ::rpc_toolkit::command_helpers::prelude::Arg::new(#name_str);
#(
arg = arg.help(#help);
)*
@@ -338,8 +341,8 @@ fn build_app(name: LitStr, opt: &mut Options, params: &mut [ParamType]) -> Token
let required = LitBool::new(subcommand_required, Span::call_site());
let alias = &opt.common().aliases;
quote! {
pub fn build_app() -> ::rpc_toolkit::command_helpers::prelude::App<'static, 'static> {
let mut app = ::rpc_toolkit::command_helpers::prelude::App::new(#name);
pub fn build_app() -> ::rpc_toolkit::command_helpers::prelude::Command<'static> {
let mut app = ::rpc_toolkit::command_helpers::prelude::Command::new(#name);
#(
app = app.about(#about);
)*
@@ -353,7 +356,7 @@ fn build_app(name: LitStr, opt: &mut Options, params: &mut [ParamType]) -> Token
app = app.subcommand(#subcommand::build_app());
)*
if #required {
app = app.setting(::rpc_toolkit::command_helpers::prelude::AppSettings::SubcommandRequired);
app = app.subcommand_required(true);
}
app
}
@@ -889,7 +892,7 @@ fn cli_handler(
_ctx: GenericContext,
_parent_data: #parent_data_ty,
_rt: Option<::rpc_toolkit::command_helpers::prelude::Runtime>,
_matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches<'_>,
_matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches,
method: ::rpc_toolkit::command_helpers::prelude::Cow<'_, str>,
_parent_params: ParentParams,
) -> Result<(), ::rpc_toolkit::command_helpers::prelude::RpcError> {
@@ -915,7 +918,7 @@ fn cli_handler(
ctx: GenericContext,
parent_data: #parent_data_ty,
mut rt: Option<::rpc_toolkit::command_helpers::prelude::Runtime>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches<'_>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches,
method: ::rpc_toolkit::command_helpers::prelude::Cow<'_, str>,
parent_params: ParentParams,
) -> Result<(), ::rpc_toolkit::command_helpers::prelude::RpcError> {
@@ -986,7 +989,7 @@ fn cli_handler(
ctx: GenericContext,
parent_data: #parent_data_ty,
mut rt: Option<::rpc_toolkit::command_helpers::prelude::Runtime>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches<'_>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches,
_method: ::rpc_toolkit::command_helpers::prelude::Cow<'_, str>,
parent_params: ParentParams
) -> Result<(), ::rpc_toolkit::command_helpers::prelude::RpcError> {
@@ -1028,7 +1031,7 @@ fn cli_handler(
ctx: GenericContext,
parent_data: #parent_data_ty,
mut rt: Option<::rpc_toolkit::command_helpers::prelude::Runtime>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches<'_>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches,
_method: ::rpc_toolkit::command_helpers::prelude::Cow<'_, str>,
parent_params: ParentParams
) -> Result<(), ::rpc_toolkit::command_helpers::prelude::RpcError> {
@@ -1163,7 +1166,7 @@ fn cli_handler(
ctx: GenericContext,
parent_data: #parent_data_ty,
mut rt: Option<::rpc_toolkit::command_helpers::prelude::Runtime>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches<'_>,
matches: &::rpc_toolkit::command_helpers::prelude::ArgMatches,
method: ::rpc_toolkit::command_helpers::prelude::Cow<'_, str>,
parent_params: ParentParams,
) -> Result<(), ::rpc_toolkit::command_helpers::prelude::RpcError> {

2
rpc-toolkit-macro-internals/src/command/mod.rs
View File

@@ -86,7 +86,7 @@ pub struct ArgOptions {
help: Option<LitStr>,
name: Option<Ident>,
rename: Option<LitStr>,
short: Option<LitStr>,
short: Option<LitChar>,
long: Option<LitStr>,
parse: Option<Path>,
default: Option<LitStr>,

8
rpc-toolkit-macro-internals/src/command/parse.rs
View File

@@ -728,13 +728,7 @@ pub fn parse_arg_attr(attr: Attribute, arg: PatType) -> Result<ArgOptions> {
return Err(Error::new(p.span(), "`rename` must be assigned to"));
}
NestedMeta::Meta(Meta::NameValue(nv)) if nv.path.is_ident("short") => {
if let Lit::Str(short) = nv.lit {
if short.value().len() != 1 {
return Err(Error::new(
short.span(),
"`short` value must be 1 character",
));
}
if let Lit::Char(short) = nv.lit {
if opt.short.is_some() {
return Err(Error::new(short.span(), "duplicate argument `short`"));
}