Skip to content

Commit 9739416

Browse files
committed
clippy: useless_let_if_seq
1 parent 6e96447 commit 9739416

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/app/parser.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,33 +1585,31 @@ impl<'a, 'b> Parser<'a, 'b>
15851585
where A: AnyArg<'a, 'b> + Display
15861586
{
15871587
debugln!("Parser::add_val_to_arg; arg={}, val={:?}", arg.name(), val);
1588-
let ret;
15891588
debugln!("Parser::add_val_to_arg; trailing_vals={:?}, DontDelimTrailingVals={:?}",
15901589
self.is_set(AS::TrailingValues),
15911590
self.is_set(AS::DontDelimitTrailingValues));
15921591
if !(self.is_set(AS::TrailingValues) && self.is_set(AS::DontDelimitTrailingValues)) {
15931592
if let Some(delim) = arg.val_delim() {
1594-
let mut iret = ParseResult::ValuesDone;
15951593
if val.is_empty_() {
1596-
iret = try!(self.add_single_val_to_arg(arg, val, matcher));
1594+
Ok(try!(self.add_single_val_to_arg(arg, val, matcher)))
15971595
} else {
1596+
let mut iret = ParseResult::ValuesDone;
15981597
for v in val.split(delim as u32 as u8) {
15991598
iret = try!(self.add_single_val_to_arg(arg, v, matcher));
16001599
}
16011600
// If there was a delimiter used, we're not looking for more values
16021601
if val.contains_byte(delim as u32 as u8) ||
1603-
arg.is_set(ArgSettings::RequireDelimiter) {
1604-
iret = ParseResult::ValuesDone;
1605-
}
1602+
arg.is_set(ArgSettings::RequireDelimiter) {
1603+
iret = ParseResult::ValuesDone;
1604+
}
1605+
Ok(iret)
16061606
}
1607-
ret = Ok(iret);
16081607
} else {
1609-
ret = self.add_single_val_to_arg(arg, val, matcher);
1608+
self.add_single_val_to_arg(arg, val, matcher)
16101609
}
16111610
} else {
1612-
ret = self.add_single_val_to_arg(arg, val, matcher);
1611+
self.add_single_val_to_arg(arg, val, matcher)
16131612
}
1614-
ret
16151613
}
16161614

16171615
fn add_single_val_to_arg<A>(&self,

0 commit comments

Comments
 (0)