Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 06:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: fixes compilation errors form cherry picked commits

Browse source
This commit is contained in:
Alan K 2018-06-02 16:10:34 +02:00 committed by Kevin K
parent 24d5fb3202
commit df35813d17
No known key found for this signature in database
GPG key ID: 17218E4B3692F01A
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/app/parser.rs
View file

@ -5,7 +5,6 @@ use std::io::{self, BufWriter, Write};
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
#[cfg(all(feature = "debug", any(target_os = "windows", target_arch = "wasm32")))] #[cfg(all(feature = "debug", any(target_os = "windows", target_arch = "wasm32")))]
use osstringext::OsStrExt3; use osstringext::OsStrExt3;
use std::path::PathBuf;
use std::slice::Iter; use std::slice::Iter;
use std::iter::Peekable; use std::iter::Peekable;
use std::mem; use std::mem;
@ -799,7 +798,7 @@ where
// Is this a new argument, or values from a previous option? // Is this a new argument, or values from a previous option?
let mut ret = if arg_os.starts_with(b"--") { let mut ret = if arg_os.starts_with(b"--") {
debugln!("Parser::is_new_arg: -- found"); debugln!("Parser::is_new_arg: -- found");
if arg_os.len_() == 2 && !arg_allows_tac { if arg_os.len() == 2 && !arg_allows_tac {
return true; // We have to return true so override everything else return true; // We have to return true so override everything else
} else if arg_allows_tac { } else if arg_allows_tac {
return false; return false;
@ -808,7 +807,7 @@ where
} else if arg_os.starts_with(b"-") { } else if arg_os.starts_with(b"-") {
debugln!("Parser::is_new_arg: - found"); debugln!("Parser::is_new_arg: - found");
// a singe '-' by itself is a value and typically means "stdin" on unix systems // a singe '-' by itself is a value and typically means "stdin" on unix systems
!(arg_os.len_() == 1) !(arg_os.len() == 1)
} else { } else {
debugln!("Parser::is_new_arg: probably value"); debugln!("Parser::is_new_arg: probably value");
false false
@ -932,21 +931,21 @@ where
fn use_long_help(&self) -> bool { fn use_long_help(&self) -> bool {
debugln!("Parser::use_long_help;"); debugln!("Parser::use_long_help;");
// In this case, both must be checked. This allows the retention of // In this case, both must be checked. This allows the retention of
// original formatting, but also ensures that the actual -h or --help // original formatting, but also ensures that the actual -h or --help
// specified by the user is sent through. If HiddenShortHelp is not included, // specified by the user is sent through. If HiddenShortHelp is not included,
// then items specified with hidden_short_help will also be hidden. // then items specified with hidden_short_help will also be hidden.
let should_long = |v: &Arg| { let should_long = |v: &Arg| {
v.long_help.is_some() || v.long_help.is_some() ||
v.is_set(ArgSettings::HiddenLongHelp) || v.is_set(ArgSettings::HiddenLongHelp) ||
v.is_set(ArgSettings::HiddenShortHelp) v.is_set(ArgSettings::HiddenShortHelp)
}; };
self.app.long_about.is_some() self.app.long_about.is_some()
|| args!(self.app).any(|f| should_long(&f)) || args!(self.app).any(|f| should_long(&f))
|| subcommands!(self.app).any(|s| s.long_about.is_some()) || subcommands!(self.app).any(|s| s.long_about.is_some())
} }
// fn _help(&self, mut use_long: bool) -> ClapError { // fn _help(&self, mut use_long: bool) -> ClapError {
// debugln!("Parser::_help: use_long={:?}", use_long && self.use_long_help()); // debugln!("Parser::_help: use_long={:?}", use_long && self.use_long_help());
// use_long = use_long && self.use_long_help(); // use_long = use_long && self.use_long_help();

2
src/app/validator.rs
View file

@ -109,7 +109,7 @@ impl<'a, 'b, 'c, 'z> Validator<'a, 'b, 'c, 'z> {
)); ));
} }
} }
if !arg.is_set(ArgSettings::EmptyValues) && val.is_empty() if !arg.is_set(ArgSettings::AllowEmptyValues) && val.is_empty()
&& matcher.contains(&*arg.name) && matcher.contains(&*arg.name)
{ {
debugln!("Validator::validate_arg_values: illegal empty val found"); debugln!("Validator::validate_arg_values: illegal empty val found");