Skip to content

Fix clippy reported problems #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/help.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl<'a> Iterator for WordsIter<'a> {
loop {
let (idx, ch) = match self.iter.next() {
None => return None,
Some((idx, ch)) => ((idx, ch)),
Some((idx, ch)) => (idx, ch),
};
match ch {
' ' | '\t' | '\r' | '\n' => continue,
Expand All @@ -48,7 +48,7 @@ impl<'a> Iterator for WordsIter<'a> {
loop {
let (idx, ch) = match self.iter.next() {
None => break,
Some((idx, ch)) => ((idx, ch)),
Some((idx, ch)) => (idx, ch),
};
match ch {
' ' | '\t' | '\r' | '\n' => {
Expand All @@ -71,22 +71,22 @@ pub fn wrap_text(buf: &mut Write, data: &str, width: usize, indent: usize)
return Ok(());
}
Some(word) => {
try!(buf.write(word.as_bytes()));
try!(buf.write_all(word.as_bytes()));
off += word.len();
}
}
for word in witer {
if off + word.len() + 1 > width {
try!(buf.write(b"\n"));
try!(buf.write_all(b"\n"));
for _ in 0..indent {
try!(buf.write(b" "));
try!(buf.write_all(b" "));
}
off = indent;
} else {
try!(buf.write(b" "));
try!(buf.write_all(b" "));
off += 1;
}
try!(buf.write(word.as_bytes()));
try!(buf.write_all(word.as_bytes()));
off += word.len();
}
return Ok(());
Expand Down
26 changes: 13 additions & 13 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ impl<'a, 'b> Context<'a, 'b> {
loop {
match self.iter.peek() {
None => { break; }
Some(arg) if arg.starts_with("-") => {
Some(arg) if arg.starts_with('-') => {
break;
}
Some(value) => {
Expand Down Expand Up @@ -407,8 +407,8 @@ impl<'a, 'b> Context<'a, 'b> {
continue;
}
Error(err) => {
write!(self.stderr,
"WARNING: Environment variable {}: {}\n",
writeln!(self.stderr,
"WARNING: Environment variable {}: {}",
evar.name, err).ok();
}
_ => unreachable!(),
Expand Down Expand Up @@ -515,7 +515,7 @@ impl<'parser, 'refer, T> Ref<'parser, 'refer, T> {
{
{
let var = &mut self.parser.vars[self.varid];
if var.metavar.len() == 0 {
if var.metavar.is_empty() {
let mut longest_name = names[0];
let mut llen = longest_name.len();
for name in names.iter() {
Expand Down Expand Up @@ -565,7 +565,7 @@ impl<'parser, 'refer, T> Ref<'parser, 'refer, T> {
}
{
let var = &mut self.parser.vars[self.varid];
if var.metavar.len() == 0 {
if var.metavar.is_empty() {
var.metavar = name.to_string();
}
}
Expand Down Expand Up @@ -691,7 +691,7 @@ impl<'parser> ArgumentParser<'parser> {
action: action,
});

if names.len() < 1 {
if names.is_empty() {
panic!("At least one name for option must be specified");
}
for nameptr in names.iter() {
Expand Down Expand Up @@ -740,7 +740,7 @@ impl<'parser> ArgumentParser<'parser> {
stdout: &mut Write, stderr: &mut Write)
-> Result<(), i32>
{
let name = if args.len() > 0 { &args[0][..] } else { "unknown" };
let name = if !args.is_empty() { &args[0][..] } else { "unknown" };
match Context::parse(self, &args, stderr) {
Parsed => return Ok(()),
Exit => return Err(0),
Expand All @@ -761,7 +761,7 @@ impl<'parser> ArgumentParser<'parser> {
/// of scope of the argparse
pub fn error(&self, command: &str, message: &str, writer: &mut Write) {
self.print_usage(command, writer).unwrap();
write!(writer, "{}: {}\n", command, message).ok();
writeln!(writer, "{}: {}", command, message).ok();
}

/// Configure parser to ignore options when first non-option argument is
Expand Down Expand Up @@ -892,11 +892,11 @@ impl<'a, 'b> HelpFormatter<'a, 'b> {
fn write_help(&mut self) -> IoResult<()> {
try!(self.write_usage());
try!(write!(self.buf, "\n"));
if self.parser.description.len() > 0 {
if !self.parser.description.is_empty() {
try!(wrap_text(self.buf, self.parser.description,TOTAL_WIDTH, 0));
try!(write!(self.buf, "\n"));
}
if self.parser.arguments.len() > 0
if !self.parser.arguments.is_empty()
|| self.parser.catchall_argument.is_some()
{
try!(write!(self.buf, "\nPositional arguments:\n"));
Expand All @@ -910,8 +910,8 @@ impl<'a, 'b> HelpFormatter<'a, 'b> {
None => {}
}
}
if self.parser.short_options.len() > 0
|| self.parser.long_options.len() > 0
if !self.parser.short_options.is_empty()
|| !self.parser.long_options.is_empty()
{
try!(write!(self.buf, "\nOptional arguments:\n"));
for opt in self.parser.options.iter() {
Expand All @@ -924,7 +924,7 @@ impl<'a, 'b> HelpFormatter<'a, 'b> {
fn write_usage(&mut self) -> IoResult<()> {
try!(write!(self.buf, "Usage:\n "));
try!(write!(self.buf, "{}", self.name));
if self.parser.options.len() != 0 {
if !self.parser.options.is_empty() {
if self.parser.short_options.len() > 1
|| self.parser.long_options.len() > 1
{
Expand Down
2 changes: 1 addition & 1 deletion src/print.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use action::{IFlagAction, ParseResult};

impl IFlagAction for Print {
fn parse_flag(&self) -> ParseResult {
if self.0.ends_with("\n") {
if self.0.ends_with('\n') {
print!("{}", self.0);
} else {
println!("{}", self.0);
Expand Down