Skip to content

Commit

Permalink
style: Clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
@epage
epage committed Feb 1, 2022
1 parent c638330 commit 3722270
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 39 deletions.
18 changes: 9 additions & 9 deletions src/build/app/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ impl<'help> App<'help> {

let mut c = Colorizer::new(false, color);
let parser = Parser::new(self);
let usage = Usage::new(&parser.app, &parser.required);
Help::new(HelpWriter::Buffer(&mut c), &parser.app, &usage, false).write_help()?;
let usage = Usage::new(parser.app, &parser.required);
Help::new(HelpWriter::Buffer(&mut c), parser.app, &usage, false).write_help()?;
c.print()
}

Expand All @@ -706,8 +706,8 @@ impl<'help> App<'help> {

let mut c = Colorizer::new(false, color);
let parser = Parser::new(self);
let usage = Usage::new(&parser.app, &parser.required);
Help::new(HelpWriter::Buffer(&mut c), &parser.app, &usage, true).write_help()?;
let usage = Usage::new(parser.app, &parser.required);
Help::new(HelpWriter::Buffer(&mut c), parser.app, &usage, true).write_help()?;
c.print()
}

Expand All @@ -731,8 +731,8 @@ impl<'help> App<'help> {
self._build();

let parser = Parser::new(self);
let usage = Usage::new(&parser.app, &parser.required);
Help::new(HelpWriter::Normal(w), &parser.app, &usage, false).write_help()?;
let usage = Usage::new(parser.app, &parser.required);
Help::new(HelpWriter::Normal(w), parser.app, &usage, false).write_help()?;
w.flush()
}

Expand All @@ -756,8 +756,8 @@ impl<'help> App<'help> {
self._build();

let parser = Parser::new(self);
let usage = Usage::new(&parser.app, &parser.required);
Help::new(HelpWriter::Normal(w), &parser.app, &usage, true).write_help()?;
let usage = Usage::new(parser.app, &parser.required);
Help::new(HelpWriter::Normal(w), parser.app, &usage, true).write_help()?;
w.flush()
}

Expand Down Expand Up @@ -825,7 +825,7 @@ impl<'help> App<'help> {
self._build();

let parser = Parser::new(self);
Usage::new(&parser.app, &parser.required).create_usage_with_title(&[])
Usage::new(parser.app, &parser.required).create_usage_with_title(&[])
}
}

Expand Down
34 changes: 17 additions & 17 deletions src/parse/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ impl<'help, 'app> Parser<'help, 'app> {
return Err(ClapError::no_equals(
self.app,
arg,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
));
}
ParseResult::NoMatchingArg { arg } => {
Expand All @@ -272,7 +272,7 @@ impl<'help, 'app> Parser<'help, 'app> {
self.app,
rest,
arg,
Usage::new(&self.app, &self.required).create_usage_no_title(&used),
Usage::new(self.app, &self.required).create_usage_no_title(&used),
))
}
ParseResult::HelpFlag => {
Expand Down Expand Up @@ -346,15 +346,15 @@ impl<'help, 'app> Parser<'help, 'app> {
return Err(ClapError::no_equals(
self.app,
arg,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
))
}
ParseResult::NoMatchingArg { arg } => {
return Err(ClapError::unknown_argument(
self.app,
arg,
None,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
));
}
ParseResult::HelpFlag => {
Expand Down Expand Up @@ -399,7 +399,7 @@ impl<'help, 'app> Parser<'help, 'app> {
self.app,
arg_os.to_str_lossy().into_owned(),
None,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
));
}

Expand Down Expand Up @@ -440,7 +440,7 @@ impl<'help, 'app> Parser<'help, 'app> {
None => {
return Err(ClapError::invalid_utf8(
self.app,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
));
}
};
Expand All @@ -454,7 +454,7 @@ impl<'help, 'app> Parser<'help, 'app> {
if !allow_invalid_utf8 && v.to_str().is_none() {
return Err(ClapError::invalid_utf8(
self.app,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
));
}
sc_m.add_val_to(
Expand Down Expand Up @@ -499,7 +499,7 @@ impl<'help, 'app> Parser<'help, 'app> {
return Err(ClapError::missing_subcommand(
self.app,
bn.to_string(),
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
));
} else if self.is_set(AS::SubcommandRequiredElseHelp) {
debug!("Parser::get_matches_with: SubcommandRequiredElseHelp=true");
Expand Down Expand Up @@ -527,7 +527,7 @@ impl<'help, 'app> Parser<'help, 'app> {
return ClapError::unnecessary_double_dash(
self.app,
arg_os.to_str_lossy().into_owned(),
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
);
}
}
Expand All @@ -548,7 +548,7 @@ impl<'help, 'app> Parser<'help, 'app> {
.as_ref()
.unwrap_or(&self.app.name)
.to_string(),
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
);
}
// If the argument must be a subcommand.
Expand All @@ -567,7 +567,7 @@ impl<'help, 'app> Parser<'help, 'app> {
self.app,
arg_os.to_str_lossy().into_owned(),
None,
Usage::new(&self.app, &self.required).create_usage_with_title(&[]),
Usage::new(self.app, &self.required).create_usage_with_title(&[]),
)
}

Expand Down Expand Up @@ -715,7 +715,7 @@ impl<'help, 'app> Parser<'help, 'app> {

if !self.is_set(AS::SubcommandsNegateReqs) {
let reqs =
Usage::new(&self.app, &self.required).get_required_usage_from(&[], None, true); // maybe Some(m)
Usage::new(self.app, &self.required).get_required_usage_from(&[], None, true); // maybe Some(m)

for s in &reqs {
mid_string.push_str(s);
Expand Down Expand Up @@ -1557,14 +1557,14 @@ impl<'help, 'app> Parser<'help, 'app> {
self.app,
format!("--{}", arg),
did_you_mean,
Usage::new(&self.app, &self.required).create_usage_with_title(&*used),
Usage::new(self.app, &self.required).create_usage_with_title(&*used),
)
}

pub(crate) fn write_help_err(&self) -> ClapResult<Colorizer> {
let usage = Usage::new(&self.app, &self.required);
let usage = Usage::new(self.app, &self.required);
let mut c = Colorizer::new(true, self.color_help());
Help::new(HelpWriter::Buffer(&mut c), &self.app, &usage, false).write_help()?;
Help::new(HelpWriter::Buffer(&mut c), self.app, &usage, false).write_help()?;
Ok(c)
}

Expand All @@ -1575,10 +1575,10 @@ impl<'help, 'app> Parser<'help, 'app> {
);

use_long = use_long && self.use_long_help();
let usage = Usage::new(&self.app, &self.required);
let usage = Usage::new(self.app, &self.required);
let mut c = Colorizer::new(false, self.color_help());

match Help::new(HelpWriter::Buffer(&mut c), &self.app, &usage, use_long).write_help() {
match Help::new(HelpWriter::Buffer(&mut c), self.app, &usage, use_long).write_help() {
Err(e) => e.into(),
_ => ClapError::for_app(self.app, c, ErrorKind::DisplayHelp, vec![]),
}
Expand Down
26 changes: 13 additions & 13 deletions src/parse/validator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
return Err(Error::empty_value(
self.p.app,
o,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
}
Expand Down Expand Up @@ -91,7 +91,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
);
return Err(Error::invalid_utf8(
self.p.app,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
if !arg.possible_vals.is_empty() {
Expand Down Expand Up @@ -122,7 +122,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
.filter_map(PossibleValue::get_visible_name)
.collect::<Vec<_>>(),
arg,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&used),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&used),
));
}
}
Expand All @@ -134,7 +134,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
return Err(Error::empty_value(
self.p.app,
arg,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}

Expand Down Expand Up @@ -209,7 +209,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
self.p.app,
arg,
Vec::new(),
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
))
})
}
Expand Down Expand Up @@ -264,7 +264,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
.chain(used_filtered.iter())
.cloned()
.collect();
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&required)
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&required)
}

fn gather_requirements(&mut self, matcher: &ArgMatcher) {
Expand Down Expand Up @@ -317,7 +317,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
return Err(Error::unexpected_multiple_usage(
self.p.app,
a,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
if let Some(max_occurs) = a.max_occurs {
Expand All @@ -332,7 +332,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
a,
max_occurs,
occurs,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
}
Expand Down Expand Up @@ -361,7 +361,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
} else {
total_num
},
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
}
Expand All @@ -378,7 +378,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
.expect(INVALID_UTF8)
.to_string(),
a.to_string(),
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
}
Expand All @@ -391,7 +391,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
a,
num,
ma.num_vals(),
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
num == 0
Expand All @@ -404,7 +404,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
return Err(Error::empty_value(
self.p.app,
a,
Usage::new(&self.p.app, &self.p.required).create_usage_with_title(&[]),
Usage::new(self.p.app, &self.p.required).create_usage_with_title(&[]),
));
}
Ok(())
Expand Down Expand Up @@ -514,7 +514,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
self.p.required
);

let usg = Usage::new(&self.p.app, &self.p.required);
let usg = Usage::new(self.p.app, &self.p.required);

let req_args = usg.get_required_usage_from(&incl, Some(matcher), true);

Expand Down

0 comments on commit 3722270

Please sign in to comment.