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

Branch simpification

Browse source
This commit is contained in:
Donough Liu 2020-12-29 23:15:50 +08:00 committed by ldm0
parent 336f926ec9
commit 9cf007378b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/parse/parser.rs
View file

@ -367,8 +367,7 @@ impl<'help, 'app> Parser<'help, 'app> {
} }
// Is this a new argument, or a value for previous option? // Is this a new argument, or a value for previous option?
let starts_new_arg = self.is_new_arg(&arg_os, &needs_val_of); if self.is_new_arg(&arg_os, &needs_val_of) {
if starts_new_arg {
if arg_os == "--" { if arg_os == "--" {
debug!("Parser::get_matches_with: setting TrailingVals=true"); debug!("Parser::get_matches_with: setting TrailingVals=true");
self.set(AS::TrailingValues); self.set(AS::TrailingValues);
@ -512,9 +511,7 @@ impl<'help, 'app> Parser<'help, 'app> {
)); ));
} }
if !self.is_set(AS::TrailingValues) if self.is_set(AS::TrailingVarArg) && pos_counter == positional_count {
&& (self.is_set(AS::TrailingVarArg) && pos_counter == positional_count)
{
self.app.settings.set(AS::TrailingValues); self.app.settings.set(AS::TrailingValues);
} }
@ -1003,7 +1000,7 @@ impl<'help, 'app> Parser<'help, 'app> {
// maybe here lifetime should be 'a // maybe here lifetime should be 'a
debug!("Parser::parse_long_arg"); debug!("Parser::parse_long_arg");
// Update the curent index // Update the current index
self.cur_idx.set(self.cur_idx.get() + 1); self.cur_idx.set(self.cur_idx.get() + 1);
debug!("Parser::parse_long_arg: Does it contain '='..."); debug!("Parser::parse_long_arg: Does it contain '='...");