Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-10 14:54:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

style: Update for latest clippy

Browse source
This commit is contained in:
Ed Page 2022-12-22 12:25:33 -06:00
parent dd8435d8f3
commit dde22e74ca
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clap_mangen/src/lib.rs
View file

@ -231,7 +231,7 @@ impl Man {
} }
fn _render_version_section(&self, roff: &mut Roff) { fn _render_version_section(&self, roff: &mut Roff) {
let version = roman(&render::version(&self.cmd)); let version = roman(render::version(&self.cmd));
roff.control("SH", ["VERSION"]); roff.control("SH", ["VERSION"]);
roff.text([version]); roff.text([version]);
} }

24
clap_mangen/src/render.rs
View file

@ -13,7 +13,7 @@ pub(crate) fn about(roff: &mut Roff, cmd: &clap::Command) {
Some(about) => format!("{} - {}", cmd.get_name(), about), Some(about) => format!("{} - {}", cmd.get_name(), about),
None => cmd.get_name().to_string(), None => cmd.get_name().to_string(),
}; };
roff.text([roman(&s)]); roff.text([roman(s)]);
} }
pub(crate) fn description(roff: &mut Roff, cmd: &clap::Command) { pub(crate) fn description(roff: &mut Roff, cmd: &clap::Command) {
@ -36,19 +36,19 @@ pub(crate) fn synopsis(roff: &mut Roff, cmd: &clap::Command) {
match (opt.get_short(), opt.get_long()) { match (opt.get_short(), opt.get_long()) {
(Some(short), Some(long)) => { (Some(short), Some(long)) => {
line.push(roman(lhs)); line.push(roman(lhs));
line.push(bold(&format!("-{}", short))); line.push(bold(format!("-{}", short)));
line.push(roman("|")); line.push(roman("|"));
line.push(bold(&format!("--{}", long))); line.push(bold(format!("--{}", long)));
line.push(roman(rhs)); line.push(roman(rhs));
} }
(Some(short), None) => { (Some(short), None) => {
line.push(roman(lhs)); line.push(roman(lhs));
line.push(bold(&format!("-{} ", short))); line.push(bold(format!("-{} ", short)));
line.push(roman(rhs)); line.push(roman(rhs));
} }
(None, Some(long)) => { (None, Some(long)) => {
line.push(roman(lhs)); line.push(roman(lhs));
line.push(bold(&format!("--{}", long))); line.push(bold(format!("--{}", long)));
line.push(roman(rhs)); line.push(roman(rhs));
} }
(None, None) => continue, (None, None) => continue,
@ -101,12 +101,12 @@ pub(crate) fn options(roff: &mut Roff, cmd: &clap::Command) {
if let Some(value) = &opt.get_value_names() { if let Some(value) = &opt.get_value_names() {
header.push(roman("=")); header.push(roman("="));
header.push(italic(&value.join(" "))); header.push(italic(value.join(" ")));
} }
if let Some(defs) = option_default_values(opt) { if let Some(defs) = option_default_values(opt) {
header.push(roman(" ")); header.push(roman(" "));
header.push(roman(&defs)); header.push(roman(defs));
} }
let mut body = vec![]; let mut body = vec![];
@ -168,13 +168,13 @@ pub(crate) fn options(roff: &mut Roff, cmd: &clap::Command) {
header.push(roman(rhs)); header.push(roman(rhs));
if let Some(defs) = option_default_values(pos) { if let Some(defs) = option_default_values(pos) {
header.push(roman(&format!(" {}", defs))); header.push(roman(format!(" {}", defs)));
} }
let mut body = vec![]; let mut body = vec![];
let mut arg_help_written = false; let mut arg_help_written = false;
if let Some(help) = option_help(pos) { if let Some(help) = option_help(pos) {
body.push(roman(&help.to_string())); body.push(roman(help.to_string()));
arg_help_written = true; arg_help_written = true;
} }
@ -229,7 +229,7 @@ pub(crate) fn subcommands(roff: &mut Roff, cmd: &clap::Command, section: &str) {
sub.get_name(), sub.get_name(),
section section
); );
roff.text([roman(&name)]); roff.text([roman(name)]);
if let Some(about) = sub.get_about().or_else(|| sub.get_long_about()) { if let Some(about) = sub.get_about().or_else(|| sub.get_long_about()) {
for line in about.to_string().lines() { for line in about.to_string().lines() {
@ -273,11 +273,11 @@ fn markers(required: bool) -> (&'static str, &'static str) {
} }
fn short_option(opt: char) -> Inline { fn short_option(opt: char) -> Inline {
bold(&format!("-{}", opt)) bold(format!("-{}", opt))
} }
fn long_option(opt: &str) -> Inline { fn long_option(opt: &str) -> Inline {
bold(&format!("--{}", opt)) bold(format!("--{}", opt))
} }
fn option_help(opt: &clap::Arg) -> Option<&clap::builder::StyledStr> { fn option_help(opt: &clap::Arg) -> Option<&clap::builder::StyledStr> {

2
examples/repl.rs
View file

@ -29,7 +29,7 @@ fn main() -> Result<(), String> {
fn respond(line: &str) -> Result<bool, String> { fn respond(line: &str) -> Result<bool, String> {
let args = shlex::split(line).ok_or("error: Invalid quoting")?; let args = shlex::split(line).ok_or("error: Invalid quoting")?;
let matches = cli() let matches = cli()
.try_get_matches_from(&args) .try_get_matches_from(args)
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
match matches.subcommand() { match matches.subcommand() {
Some(("ping", _matches)) => { Some(("ping", _matches)) => {

4
src/builder/command.rs
View file

@ -487,7 +487,7 @@ impl Command {
/// [`Command::try_get_matches_from_mut`]: Command::try_get_matches_from_mut() /// [`Command::try_get_matches_from_mut`]: Command::try_get_matches_from_mut()
#[inline] #[inline]
pub fn get_matches(self) -> ArgMatches { pub fn get_matches(self) -> ArgMatches {
self.get_matches_from(&mut env::args_os()) self.get_matches_from(env::args_os())
} }
/// Parse [`env::args_os`], exiting on failure. /// Parse [`env::args_os`], exiting on failure.
@ -545,7 +545,7 @@ impl Command {
#[inline] #[inline]
pub fn try_get_matches(self) -> ClapResult<ArgMatches> { pub fn try_get_matches(self) -> ClapResult<ArgMatches> {
// Start the parsing // Start the parsing
self.try_get_matches_from(&mut env::args_os()) self.try_get_matches_from(env::args_os())
} }
/// Parse the specified arguments, exiting on failure. /// Parse the specified arguments, exiting on failure.