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

Merge pull request #3370 from blyxxyz/size

Browse source 
Optimize code size
This commit is contained in:
Ed Page 2022-01-29 17:33:44 -06:00 committed by GitHub
commit 66d7d503af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/output/fmt.rs
View file

@ -14,7 +14,7 @@ pub(crate) struct Colorizer {
} }
impl Colorizer { impl Colorizer {
#[inline] #[inline(never)]
pub(crate) fn new(use_stderr: bool, color_when: ColorChoice) -> Self { pub(crate) fn new(use_stderr: bool, color_when: ColorChoice) -> Self {
Colorizer { Colorizer {
use_stderr, use_stderr,
@ -23,28 +23,28 @@ impl Colorizer {
} }
} }
#[inline] #[inline(never)]
pub(crate) fn good(&mut self, msg: impl Into<String>) { pub(crate) fn good(&mut self, msg: impl Into<String>) {
self.pieces.push((msg.into(), Style::Good)); self.pieces.push((msg.into(), Style::Good));
} }
#[inline] #[inline(never)]
pub(crate) fn warning(&mut self, msg: impl Into<String>) { pub(crate) fn warning(&mut self, msg: impl Into<String>) {
self.pieces.push((msg.into(), Style::Warning)); self.pieces.push((msg.into(), Style::Warning));
} }
#[inline] #[inline(never)]
pub(crate) fn error(&mut self, msg: impl Into<String>) { pub(crate) fn error(&mut self, msg: impl Into<String>) {
self.pieces.push((msg.into(), Style::Error)); self.pieces.push((msg.into(), Style::Error));
} }
#[inline] #[inline(never)]
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) fn hint(&mut self, msg: impl Into<String>) { pub(crate) fn hint(&mut self, msg: impl Into<String>) {
self.pieces.push((msg.into(), Style::Hint)); self.pieces.push((msg.into(), Style::Hint));
} }
#[inline] #[inline(never)]
pub(crate) fn none(&mut self, msg: impl Into<String>) { pub(crate) fn none(&mut self, msg: impl Into<String>) {
self.pieces.push((msg.into(), Style::Default)); self.pieces.push((msg.into(), Style::Default));
} }

45
src/output/help.rs
View file

@ -2,7 +2,6 @@
use std::{ use std::{
borrow::Cow, borrow::Cow,
cmp, cmp,
collections::BTreeMap,
io::{self, Write}, io::{self, Write},
usize, usize,
}; };
@ -125,14 +124,17 @@ macro_rules! write_method {
// Methods to write Arg help. // Methods to write Arg help.
impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> { impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
#[inline(never)]
fn good<T: Into<String> + AsRef<[u8]>>(&mut self, msg: T) -> io::Result<()> { fn good<T: Into<String> + AsRef<[u8]>>(&mut self, msg: T) -> io::Result<()> {
write_method!(self, msg, good) write_method!(self, msg, good)
} }
#[inline(never)]
fn warning<T: Into<String> + AsRef<[u8]>>(&mut self, msg: T) -> io::Result<()> { fn warning<T: Into<String> + AsRef<[u8]>>(&mut self, msg: T) -> io::Result<()> {
write_method!(self, msg, warning) write_method!(self, msg, warning)
} }
#[inline(never)]
fn none<T: Into<String> + AsRef<[u8]>>(&mut self, msg: T) -> io::Result<()> { fn none<T: Into<String> + AsRef<[u8]>>(&mut self, msg: T) -> io::Result<()> {
write_method!(self, msg, none) write_method!(self, msg, none)
} }
@ -179,7 +181,7 @@ impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
debug!("Help::write_args"); debug!("Help::write_args");
// The shortest an arg can legally be is 2 (i.e. '-x') // The shortest an arg can legally be is 2 (i.e. '-x')
let mut longest = 2; let mut longest = 2;
let mut ord_m = BTreeMap::new(); let mut ord_v = Vec::new();
// Determine the longest // Determine the longest
for arg in args.iter().filter(|arg| { for arg in args.iter().filter(|arg| {
@ -193,9 +195,6 @@ impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
longest = longest.max(display_width(arg.to_string().as_str())); longest = longest.max(display_width(arg.to_string().as_str()));
debug!("Help::write_args: New Longest...{}", longest); debug!("Help::write_args: New Longest...{}", longest);
} }
let btm = ord_m
.entry(arg.get_display_order())
.or_insert_with(BTreeMap::new);
// Formatting key like this to ensure that: // Formatting key like this to ensure that:
// 1. Argument has long flags are printed just after short flags. // 1. Argument has long flags are printed just after short flags.
@ -216,19 +215,15 @@ impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
s.push_str(arg.name); s.push_str(arg.name);
s s
}; };
btm.insert(key, arg); ord_v.push((arg.get_display_order(), key, arg));
} }
ord_v.sort_by(|a, b| (a.0, &a.1).cmp(&(b.0, &b.1)));
let next_line_help = self.will_args_wrap(args, longest); let next_line_help = self.will_args_wrap(args, longest);
let num_ord_m = ord_m.len(); for (i, (_, _, arg)) in ord_v.iter().enumerate() {
for (i, btm) in ord_m.values().enumerate() { let last_arg = i + 1 == ord_v.len();
let last_btm = i + 1 == num_ord_m; self.write_arg(arg, last_arg, next_line_help, longest)?;
let num_args = btm.len();
for (i, arg) in btm.values().enumerate() {
let last_arg = last_btm && i + 1 == num_args;
self.write_arg(arg, last_arg, next_line_help, longest)?;
}
} }
Ok(()) Ok(())
} }
@ -835,15 +830,12 @@ impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
debug!("Help::write_subcommands"); debug!("Help::write_subcommands");
// The shortest an arg can legally be is 2 (i.e. '-x') // The shortest an arg can legally be is 2 (i.e. '-x')
let mut longest = 2; let mut longest = 2;
let mut ord_m = BTreeMap::new(); let mut ord_v = Vec::new();
for subcommand in app for subcommand in app
.subcommands .subcommands
.iter() .iter()
.filter(|subcommand| should_show_subcommand(subcommand)) .filter(|subcommand| should_show_subcommand(subcommand))
{ {
let btm = ord_m
.entry(subcommand.get_display_order())
.or_insert_with(BTreeMap::new);
let mut sc_str = String::new(); let mut sc_str = String::new();
sc_str.push_str( sc_str.push_str(
&subcommand &subcommand
@ -857,23 +849,22 @@ impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
); );
sc_str.push_str(&subcommand.name); sc_str.push_str(&subcommand.name);
longest = longest.max(display_width(&sc_str)); longest = longest.max(display_width(&sc_str));
btm.insert(sc_str, subcommand.clone()); ord_v.push((subcommand.get_display_order(), sc_str, subcommand.clone()));
} }
ord_v.sort_by(|a, b| (a.0, &a.1).cmp(&(b.0, &b.1)));
debug!("Help::write_subcommands longest = {}", longest); debug!("Help::write_subcommands longest = {}", longest);
let next_line_help = self.will_subcommands_wrap(&app.subcommands, longest); let next_line_help = self.will_subcommands_wrap(&app.subcommands, longest);
let mut first = true; let mut first = true;
for btm in ord_m.values() { for (_, sc_str, sc) in &ord_v {
for (sc_str, sc) in btm { if first {
if first { first = false;
first = false; } else {
} else { self.none("\n")?;
self.none("\n")?;
}
self.write_subcommand(sc_str, sc, next_line_help, longest)?;
} }
self.write_subcommand(sc_str, sc, next_line_help, longest)?;
} }
Ok(()) Ok(())
} }