Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-10 14:54:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2048

Browse source 
2048: Change the ret tyte of Argmatches::subcommand r=pksunkara a=CreepySkeleton



Co-authored-by: CreepySkeleton <creepy-skeleton@yandex.ru>
This commit is contained in:
bors[bot] 2020-08-11 00:20:35 +00:00 committed by GitHub
commit da92a32d10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 31 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clap_derive/src/derives/from_arg_matches.rs
View file

@ -65,9 +65,7 @@ pub fn gen_for_enum(name: &Ident) -> TokenStream {
#[deny(clippy::correctness)]
impl ::clap::FromArgMatches for #name {
fn from_arg_matches(matches: &::clap::ArgMatches) -> Self {
let (name, subcmd) = matches.subcommand();
<#name as ::clap::Subcommand>::from_subcommand(name, subcmd)
.unwrap()
<#name as ::clap::Subcommand>::from_subcommand(matches.subcommand()).unwrap()
}
}
}
@ -107,11 +105,7 @@ pub fn gen_constructor(fields: &Punctuated<Field, Comma>, parent_attribute: &Att
};
quote_spanned! { kind.span()=>
#field_name: {
let (name, subcmd) = matches.subcommand();
<#subcmd_type as ::clap::Subcommand>::from_subcommand(
name,
subcmd
)
<#subcmd_type as ::clap::Subcommand>::from_subcommand(matches.subcommand())
#unwrapper
}
}

23
clap_derive/src/derives/subcommand.rs
View file

@ -238,7 +238,7 @@ fn gen_from_subcommand(
};
quote! {
(#sub_name, Some(matches)) => {
Some((#sub_name, matches)) => {
Some(#name :: #variant_name #constructor_block)
}
}
@ -249,7 +249,7 @@ fn gen_from_subcommand(
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
let ty = &fields.unnamed[0];
quote! {
if let Some(res) = <#ty as ::clap::Subcommand>::from_subcommand(other.0, other.1) {
if let Some(res) = <#ty as ::clap::Subcommand>::from_subcommand(other) {
return Some(#name :: #variant_name (res));
}
}
@ -263,9 +263,9 @@ fn gen_from_subcommand(
let wildcard = match ext_subcmd {
Some((span, var_name, str_ty, values_of)) => quote_spanned! { span=>
("", ::std::option::Option::None) => ::std::option::Option::None,
None => ::std::option::Option::None,
(external, Some(matches)) => {
Some((external, matches)) => {
::std::option::Option::Some(#name::#var_name(
::std::iter::once(#str_ty::from(external))
.chain(
@ -274,25 +274,14 @@ fn gen_from_subcommand(
.collect::<::std::vec::Vec<_>>()
))
}
(external, None) => {
::std::option::Option::Some(#name::#var_name({
let mut v = ::std::vec::Vec::with_capacity(1);
v.push(#str_ty::from(external));
v
}))
}
},
None => quote!(_ => None),
};
quote! {
fn from_subcommand<'b>(
name: &'b str,
sub: Option<&'b ::clap::ArgMatches>) -> Option<Self>
{
match (name, sub) {
fn from_subcommand(subcommand: Option<(&str, &::clap::ArgMatches)>) -> Option<Self> {
match subcommand {
#( #match_arms, )*
other => {
#( #child_subcommands )else*

2
clap_derive/src/dummies.rs
View file

@ -44,7 +44,7 @@ pub fn from_arg_matches(name: &Ident) {
pub fn subcommand(name: &Ident) {
append_dummy(quote! {
impl ::clap::Subcommand for #name {
fn from_subcommand(_name: &str, _matches: Option<&::clap::ArgMatches>) -> Option<Self> {
fn from_subcommand(_sub: Option<(&str, &::clap::ArgMatches)>) -> Option<Self> {
unimplemented!()
}
fn augment_subcommands(_app: ::clap::App<'_>) -> ::clap::App<'_> {

4
examples/16_app_settings.rs
View file

@ -28,8 +28,8 @@ fn main() {
println!("The input file is: {}", inp);
}
match matches.subcommand() {
("test", _) => println!("The 'test' subcommand was used"),
match matches.subcommand_name() {
Some("test") => println!("The 'test' subcommand was used"),
_ => unreachable!(),
}
}

12
examples/20_subcommands.rs
View file

@ -120,24 +120,24 @@ fn main() {
// The most common way to handle subcommands is via a combined approach using
// `ArgMatches::subcommand` which returns a tuple of both the name and matches
match matches.subcommand() {
("clone", Some(clone_matches)) => {
Some(("clone", clone_matches)) => {
// Now we have a reference to clone's matches
println!("Cloning {}", clone_matches.value_of("repo").unwrap());
}
("push", Some(push_matches)) => {
Some(("push", push_matches)) => {
// Now we have a reference to push's matches
match push_matches.subcommand() {
("remote", Some(remote_matches)) => {
Some(("remote", remote_matches)) => {
// Now we have a reference to remote's matches
println!("Pushing to {}", remote_matches.value_of("repo").unwrap());
}
("local", Some(_)) => {
Some(("local", _)) => {
println!("'git push local' was used");
}
_ => unreachable!(),
}
}
("add", Some(add_matches)) => {
Some(("add", add_matches)) => {
// Now we have a reference to add's matches
println!(
"Adding {}",
@ -148,7 +148,7 @@ fn main() {
.join(", ")
);
}
("", None) => println!("No subcommand was used"), // If no subcommand was usd it'll match the tuple ("", None)
None => println!("No subcommand was used"), // If no subcommand was used it'll match the tuple ("", None)
_ => unreachable!(), // If all subcommands are defined above, anything else is unreachabe!()
}

4
examples/23_flag_subcommands_pacman.rs
View file

@ -86,7 +86,7 @@ fn main() {
.get_matches();
match matches.subcommand() {
("sync", Some(sync_matches)) => {
Some(("sync", sync_matches)) => {
if sync_matches.is_present("search") {
let packages: Vec<_> = sync_matches.values_of("search").unwrap().collect();
let values = packages.join(", ");
@ -103,7 +103,7 @@ fn main() {
println!("Installing {}...", values);
}
}
("query", Some(query_matches)) => {
Some(("query", query_matches)) => {
if let Some(packages) = query_matches.values_of("info") {
let comma_sep = packages.collect::<Vec<_>>().join(", ");
println!("Retrieving info for {}...", comma_sep);

2
src/build/app/settings.rs
View file

@ -387,7 +387,7 @@ pub enum AppSettings {
/// // All trailing arguments will be stored under the subcommand's sub-matches using an empty
/// // string argument name
/// match m.subcommand() {
/// (external, Some(ext_m)) => {
/// Some((external, ext_m)) => {
/// let ext_args: Vec<&str> = ext_m.values_of("").unwrap().collect();
/// assert_eq!(external, "subcmd");
/// assert_eq!(ext_args, ["--option", "value", "-fff", "--flag"]);

6
src/derive.rs
View file

@ -60,7 +60,7 @@ pub trait FromArgMatches: Sized {
/// @TODO @release @docs
pub trait Subcommand: Sized {
/// @TODO @release @docs
fn from_subcommand(name: &str, matches: Option<&ArgMatches>) -> Option<Self>;
fn from_subcommand(subcommand: Option<(&str, &ArgMatches)>) -> Option<Self>;
/// @TODO @release @docs
fn augment_subcommands(app: App<'_>) -> App<'_>;
}
@ -118,8 +118,8 @@ impl<T: FromArgMatches> FromArgMatches for Box<T> {
}
impl<T: Subcommand> Subcommand for Box<T> {
fn from_subcommand(name: &str, matches: Option<&ArgMatches>) -> Option<Self> {
<T as Subcommand>::from_subcommand(name, matches).map(Box::new)
fn from_subcommand(subcommand: Option<(&str, &ArgMatches)>) -> Option<Self> {
<T as Subcommand>::from_subcommand(subcommand).map(Box::new)
}
fn augment_subcommands(app: App<'_>) -> App<'_> {
<T as Subcommand>::augment_subcommands(app)

14
src/parse/matches/arg_matches.rs
View file

@ -886,9 +886,9 @@ impl ArgMatches {
/// .get_matches();
///
/// match app_m.subcommand() {
/// ("clone", Some(sub_m)) => {}, // clone was used
/// ("push", Some(sub_m)) => {}, // push was used
/// ("commit", Some(sub_m)) => {}, // commit was used
/// Some(("clone", sub_m)) => {}, // clone was used
/// Some(("push", sub_m)) => {}, // push was used
/// Some(("commit", sub_m)) => {}, // commit was used
/// _ => {}, // Either no subcommand or one not tested for...
/// }
/// ```
@ -909,7 +909,7 @@ impl ArgMatches {
/// // All trailing arguments will be stored under the subcommand's sub-matches using an empty
/// // string argument name
/// match app_m.subcommand() {
/// (external, Some(sub_m)) => {
/// Some((external, sub_m)) => {
/// let ext_args: Vec<&str> = sub_m.values_of("").unwrap().collect();
/// assert_eq!(external, "subcmd");
/// assert_eq!(ext_args, ["--option", "value", "-fff", "--flag"]);
@ -920,10 +920,8 @@ impl ArgMatches {
/// [`ArgMatches::subcommand_matches`]: ./struct.ArgMatches.html#method.subcommand_matches
/// [`ArgMatches::subcommand_name`]: ./struct.ArgMatches.html#method.subcommand_name
#[inline]
pub fn subcommand(&self) -> (&str, Option<&ArgMatches>) {
self.subcommand
.as_ref()
.map_or(("", None), |sc| (&sc.name[..], Some(&sc.matches)))
pub fn subcommand(&self) -> Option<(&str, &ArgMatches)> {
self.subcommand.as_ref().map(|sc| (&*sc.name, &sc.matches))
}
}

4
tests/app_settings.rs
View file

@ -735,7 +735,7 @@ fn allow_ext_sc_when_sc_required() {
assert!(res.is_ok());
match res.unwrap().subcommand() {
(name, Some(args)) => {
Some((name, args)) => {
assert_eq!(name, "external-cmd");
assert_eq!(args.values_of_lossy(""), Some(vec!["foo".to_string()]));
}
@ -753,7 +753,7 @@ fn external_subcommand_looks_like_built_in() {
assert!(res.is_ok());
let m = res.unwrap();
match m.subcommand() {
(name, Some(args)) => {
Some((name, args)) => {
assert_eq!(name, "install-update");
assert_eq!(args.values_of_lossy(""), Some(vec!["foo".to_string()]));
}