From 23b68d80bad807df1dcb6dd8e4d925988744df05 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Wed, 30 Jun 2021 23:03:14 -0500 Subject: [PATCH] refactor ~ `usage()` instead of `get_usage()` --- src/uu/base32/src/base32.rs | 4 ++-- src/uu/base64/src/base64.rs | 4 ++-- src/uu/basename/src/basename.rs | 4 ++-- src/uu/chgrp/src/chgrp.rs | 4 ++-- src/uu/chmod/src/chmod.rs | 4 ++-- src/uu/chown/src/chown.rs | 4 ++-- src/uu/comm/src/comm.rs | 4 ++-- src/uu/cp/src/cp.rs | 4 ++-- src/uu/csplit/src/csplit.rs | 4 ++-- src/uu/df/src/df.rs | 4 ++-- src/uu/dircolors/src/dircolors.rs | 4 ++-- src/uu/dirname/src/dirname.rs | 4 ++-- src/uu/du/src/du.rs | 4 ++-- src/uu/expand/src/expand.rs | 4 ++-- src/uu/fmt/src/fmt.rs | 4 ++-- src/uu/groups/src/groups.rs | 4 ++-- src/uu/hostname/src/hostname.rs | 5 +++-- src/uu/id/src/id.rs | 4 ++-- src/uu/install/src/install.rs | 4 ++-- src/uu/link/src/link.rs | 4 ++-- src/uu/ln/src/ln.rs | 8 ++++---- src/uu/logname/src/logname.rs | 4 ++-- src/uu/ls/src/ls.rs | 4 ++-- src/uu/mkdir/src/mkdir.rs | 4 ++-- src/uu/mktemp/src/mktemp.rs | 4 ++-- src/uu/mv/src/mv.rs | 4 ++-- src/uu/nice/src/nice.rs | 4 ++-- src/uu/nohup/src/nohup.rs | 4 ++-- src/uu/nproc/src/nproc.rs | 4 ++-- src/uu/numfmt/src/numfmt.rs | 4 ++-- src/uu/pathchk/src/pathchk.rs | 4 ++-- src/uu/pinky/src/pinky.rs | 4 ++-- src/uu/printenv/src/printenv.rs | 4 ++-- src/uu/pwd/src/pwd.rs | 4 ++-- src/uu/readlink/src/readlink.rs | 4 ++-- src/uu/realpath/src/realpath.rs | 4 ++-- src/uu/relpath/src/relpath.rs | 4 ++-- src/uu/rm/src/rm.rs | 4 ++-- src/uu/rmdir/src/rmdir.rs | 4 ++-- src/uu/seq/src/seq.rs | 4 ++-- src/uu/shred/src/shred.rs | 4 ++-- src/uu/sleep/src/sleep.rs | 4 ++-- src/uu/sort/src/sort.rs | 4 ++-- src/uu/split/src/split.rs | 6 +++--- src/uu/stat/src/stat.rs | 4 ++-- src/uu/stdbuf/src/stdbuf.rs | 4 ++-- src/uu/sync/src/sync.rs | 4 ++-- src/uu/tee/src/tee.rs | 4 ++-- src/uu/timeout/src/timeout.rs | 4 ++-- src/uu/touch/src/touch.rs | 4 ++-- src/uu/tr/src/tr.rs | 4 ++-- src/uu/truncate/src/truncate.rs | 4 ++-- src/uu/tty/src/tty.rs | 4 ++-- src/uu/uniq/src/uniq.rs | 4 ++-- src/uu/unlink/src/unlink.rs | 4 ++-- src/uu/uptime/src/uptime.rs | 4 ++-- src/uu/users/src/users.rs | 4 ++-- src/uu/wc/src/wc.rs | 4 ++-- src/uu/who/src/who.rs | 4 ++-- 59 files changed, 122 insertions(+), 121 deletions(-) diff --git a/src/uu/base32/src/base32.rs b/src/uu/base32/src/base32.rs index 9a29717ac..8e02f03e0 100644 --- a/src/uu/base32/src/base32.rs +++ b/src/uu/base32/src/base32.rs @@ -28,13 +28,13 @@ static VERSION: &str = env!("CARGO_PKG_VERSION"); static BASE_CMD_PARSE_ERROR: i32 = 1; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { let format = Format::Base32; - let usage = get_usage(); + let usage = usage(); let name = executable!(); let config_result: Result = diff --git a/src/uu/base64/src/base64.rs b/src/uu/base64/src/base64.rs index 71ed44e6e..48aee537d 100644 --- a/src/uu/base64/src/base64.rs +++ b/src/uu/base64/src/base64.rs @@ -29,13 +29,13 @@ static VERSION: &str = env!("CARGO_PKG_VERSION"); static BASE_CMD_PARSE_ERROR: i32 = 1; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { let format = Format::Base64; - let usage = get_usage(); + let usage = usage(); let name = executable!(); let config_result: Result = base_common::parse_base_cmd_args(args, name, VERSION, ABOUT, &usage); diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs index aa1e2fa2d..f3c9f5391 100644 --- a/src/uu/basename/src/basename.rs +++ b/src/uu/basename/src/basename.rs @@ -17,7 +17,7 @@ use uucore::InvalidEncodingHandling; static SUMMARY: &str = "Print NAME with any leading directory components removed If specified, also remove a trailing SUFFIX"; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} NAME [SUFFIX] {0} OPTION... NAME...", @@ -36,7 +36,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); // // Argument parsing // diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index db1e20e57..11a45c90a 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -59,7 +59,7 @@ const FTS_COMFOLLOW: u8 = 1; const FTS_PHYSICAL: u8 = 1 << 1; const FTS_LOGICAL: u8 = 1 << 2; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... GROUP FILE...\n {0} [OPTION]... --reference=RFILE FILE...", executable!() @@ -71,7 +71,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); let mut app = uu_app().usage(&usage[..]); diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index d39ac4556..e1d8b32e4 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -36,7 +36,7 @@ mod options { pub const FILE: &str = "FILE"; } -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... MODE[,MODE]... FILE... or: {0} [OPTION]... OCTAL-MODE FILE... @@ -58,7 +58,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { // a possible MODE prefix '-' needs to be removed (e.g. "chmod -x FILE"). let mode_had_minus_prefix = strip_minus_from_mode(&mut args); - let usage = get_usage(); + let usage = usage(); let after_help = get_long_usage(); let matches = uu_app() diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs index 50c651e1f..a5d7c5ac7 100644 --- a/src/uu/chown/src/chown.rs +++ b/src/uu/chown/src/chown.rs @@ -61,7 +61,7 @@ const FTS_COMFOLLOW: u8 = 1; const FTS_PHYSICAL: u8 = 1 << 1; const FTS_LOGICAL: u8 = 1 << 2; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [OWNER][:[GROUP]] FILE...\n{0} [OPTION]... --reference=RFILE FILE...", executable!() @@ -74,7 +74,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs index 69db9c556..36238cd5f 100644 --- a/src/uu/comm/src/comm.rs +++ b/src/uu/comm/src/comm.rs @@ -31,7 +31,7 @@ mod options { pub const FILE_2: &str = "FILE2"; } -fn get_usage() -> String { +fn usage() -> String { format!("{} [OPTION]... FILE1 FILE2", executable!()) } @@ -132,7 +132,7 @@ fn open_file(name: &str) -> io::Result { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index 542e9bfee..406f6757d 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -218,7 +218,7 @@ static LONG_HELP: &str = ""; static EXIT_OK: i32 = 0; static EXIT_ERR: i32 = 1; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [-T] SOURCE DEST {0} [OPTION]... SOURCE... DIRECTORY @@ -465,7 +465,7 @@ pub fn uu_app() -> App<'static, 'static> { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app() .after_help(&*format!( "{}\n{}", diff --git a/src/uu/csplit/src/csplit.rs b/src/uu/csplit/src/csplit.rs index 039501401..409b17b98 100644 --- a/src/uu/csplit/src/csplit.rs +++ b/src/uu/csplit/src/csplit.rs @@ -34,7 +34,7 @@ mod options { pub const PATTERN: &str = "pattern"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... FILE PATTERN...", executable!()) } @@ -706,7 +706,7 @@ mod tests { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let args = args .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs index 9977370c4..4ffa8b532 100644 --- a/src/uu/df/src/df.rs +++ b/src/uu/df/src/df.rs @@ -79,7 +79,7 @@ struct Filesystem { usage: FsUsage, } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } @@ -284,7 +284,7 @@ impl UError for DfError { #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let paths: Vec = matches diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs index 27b43b9a0..90b48c301 100644 --- a/src/uu/dircolors/src/dircolors.rs +++ b/src/uu/dircolors/src/dircolors.rs @@ -62,7 +62,7 @@ pub fn guess_syntax() -> OutputFmt { } } -fn get_usage() -> String { +fn usage() -> String { format!("{0} {1}", executable!(), SYNTAX) } @@ -71,7 +71,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(&args); diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index d6e09acc1..3162bef48 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -20,7 +20,7 @@ mod options { pub const DIR: &str = "dir"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION] NAME...", executable!()) } @@ -37,7 +37,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); let after_help = get_long_usage(); let matches = uu_app() diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 6160f5490..56f412ffb 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -392,7 +392,7 @@ fn convert_size_other(size: u64, _multiplier: u64, block_size: u64) -> String { format!("{}", ((size as f64) / (block_size as f64)).ceil()) } -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [FILE]... {0} [OPTION]... --files0-from=F", @@ -456,7 +456,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs index a821aed33..29de6ae44 100644 --- a/src/uu/expand/src/expand.rs +++ b/src/uu/expand/src/expand.rs @@ -32,7 +32,7 @@ static LONG_HELP: &str = ""; static DEFAULT_TABSTOP: usize = 8; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } @@ -170,7 +170,7 @@ impl Options { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); expand(Options::new(&matches)); diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs index 87febb124..80f74cf84 100644 --- a/src/uu/fmt/src/fmt.rs +++ b/src/uu/fmt/src/fmt.rs @@ -50,7 +50,7 @@ static OPT_TAB_WIDTH: &str = "tab-width"; static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!("{} [OPTION]... [FILE]...", executable!()) } @@ -75,7 +75,7 @@ pub struct FmtOptions { #[allow(clippy::cognitive_complexity)] pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index a7c989ddf..fe1065cc1 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -28,12 +28,12 @@ static ABOUT: &str = "Print group memberships for each USERNAME or, \ if no USERNAME is specified, for\nthe current process \ (which may differ if the groups data‐base has changed)."; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [USERNAME]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs index e42629eff..2b7deb565 100644 --- a/src/uu/hostname/src/hostname.rs +++ b/src/uu/hostname/src/hostname.rs @@ -53,11 +53,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { result } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [HOSTNAME]", executable!()) } + fn execute(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); match matches.value_of(OPT_HOST) { diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs index ce2d8eaf1..16c521ea3 100644 --- a/src/uu/id/src/id.rs +++ b/src/uu/id/src/id.rs @@ -76,7 +76,7 @@ mod options { pub const ARG_USERS: &str = "USER"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [USER]...", executable!()) } @@ -127,7 +127,7 @@ struct State { #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let after_help = get_description(); let matches = uu_app() diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index 33a21be88..5ee103e0f 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -172,7 +172,7 @@ static OPT_CONTEXT: &str = "context"; static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } @@ -182,7 +182,7 @@ fn get_usage() -> String { /// #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/link/src/link.rs b/src/uu/link/src/link.rs index 5344eb9c8..d06025815 100644 --- a/src/uu/link/src/link.rs +++ b/src/uu/link/src/link.rs @@ -19,7 +19,7 @@ pub mod options { pub static FILES: &str = "FILES"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} FILE1 FILE2", executable!()) } @@ -31,7 +31,7 @@ pub fn normalize_error_message(e: Error) -> String { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let files: Vec<_> = matches diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index 568c97e45..572c68379 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -92,7 +92,7 @@ impl UError for LnError { } } -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [-T] TARGET LINK_NAME (1st form) {0} [OPTION]... TARGET (2nd form) @@ -102,7 +102,7 @@ fn get_usage() -> String { ) } -fn get_long_usage() -> String { +fn long_usage() -> String { String::from( " In the 1st form, create a link to TARGET with the name LINK_NAME. In the 2nd form, create a link to TARGET in the current directory. @@ -136,8 +136,8 @@ static ARG_FILES: &str = "files"; #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); - let long_usage = get_long_usage(); + let usage = usage(); + let long_usage = long_usage(); let matches = uu_app() .usage(&usage[..]) diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs index 45187be18..095f3fc84 100644 --- a/src/uu/logname/src/logname.rs +++ b/src/uu/logname/src/logname.rs @@ -35,7 +35,7 @@ fn get_userlogin() -> Option { static SUMMARY: &str = "Print user's login name"; -fn get_usage() -> String { +fn usage() -> String { String::from(executable!()) } @@ -44,7 +44,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let _ = uu_app().usage(&usage[..]).get_matches_from(args); match get_userlogin() { diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 6e49e7ef9..f02a53738 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -46,7 +46,7 @@ use unicode_width::UnicodeWidthStr; use uucore::libc::{S_IXGRP, S_IXOTH, S_IXUSR}; use uucore::{fs::display_permissions, version_cmp::version_cmp}; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } @@ -603,7 +603,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let app = uu_app().usage(&usage[..]); diff --git a/src/uu/mkdir/src/mkdir.rs b/src/uu/mkdir/src/mkdir.rs index 8d492a93c..e9aa4bc22 100644 --- a/src/uu/mkdir/src/mkdir.rs +++ b/src/uu/mkdir/src/mkdir.rs @@ -22,13 +22,13 @@ mod options { pub const DIRS: &str = "dirs"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [USER]", executable!()) } #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); // Linux-specific options, not implemented // opts.optflag("Z", "context", "set SELinux security context" + diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs index 645c5ac28..52d60d140 100644 --- a/src/uu/mktemp/src/mktemp.rs +++ b/src/uu/mktemp/src/mktemp.rs @@ -36,7 +36,7 @@ static OPT_T: &str = "t"; static ARG_TEMPLATE: &str = "template"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [TEMPLATE]", executable!()) } @@ -74,7 +74,7 @@ impl Display for MkTempError { #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index c064a2244..1c25e653c 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -58,7 +58,7 @@ static OPT_VERBOSE: &str = "verbose"; static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [-T] SOURCE DEST {0} [OPTION]... SOURCE... DIRECTORY @@ -68,7 +68,7 @@ fn get_usage() -> String { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app() .after_help(&*format!( diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index 3b62d8058..c071a875f 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -22,7 +22,7 @@ pub mod options { pub static COMMAND: &str = "COMMAND"; } -fn get_usage() -> String { +fn usage() -> String { format!( " {0} [OPTIONS] [COMMAND [ARGS]] @@ -36,7 +36,7 @@ process).", } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs index 60654672d..a6f08e806 100644 --- a/src/uu/nohup/src/nohup.rs +++ b/src/uu/nohup/src/nohup.rs @@ -40,7 +40,7 @@ mod options { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); @@ -156,7 +156,7 @@ fn find_stdout() -> File { } } -fn get_usage() -> String { +fn usage() -> String { format!("{0} COMMAND [ARG]...\n {0} FLAG", executable!()) } diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs index ae8e66492..427a3cd2f 100644 --- a/src/uu/nproc/src/nproc.rs +++ b/src/uu/nproc/src/nproc.rs @@ -27,12 +27,12 @@ static OPT_IGNORE: &str = "ignore"; static ABOUT: &str = "Print the number of cores available to the current process."; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTIONS]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let mut ignore = match matches.value_of(OPT_IGNORE) { diff --git a/src/uu/numfmt/src/numfmt.rs b/src/uu/numfmt/src/numfmt.rs index 4f9d90a6c..6012bbf82 100644 --- a/src/uu/numfmt/src/numfmt.rs +++ b/src/uu/numfmt/src/numfmt.rs @@ -50,7 +50,7 @@ FIELDS supports cut(1) style field ranges: Multiple fields/ranges can be separated with commas "; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [NUMBER]...", executable!()) } @@ -154,7 +154,7 @@ fn parse_options(args: &ArgMatches) -> Result { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/pathchk/src/pathchk.rs b/src/uu/pathchk/src/pathchk.rs index 46edf0850..4d257a771 100644 --- a/src/uu/pathchk/src/pathchk.rs +++ b/src/uu/pathchk/src/pathchk.rs @@ -39,12 +39,12 @@ mod options { const POSIX_PATH_MAX: usize = 256; const POSIX_NAME_MAX: usize = 14; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... NAME...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs index 58c4f56ed..4aad2c07d 100644 --- a/src/uu/pinky/src/pinky.rs +++ b/src/uu/pinky/src/pinky.rs @@ -40,7 +40,7 @@ mod options { pub const USER: &str = "user"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [USER]...", executable!()) } @@ -57,7 +57,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let after_help = get_long_usage(); let matches = uu_app() diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs index 7164f5092..0e86f1012 100644 --- a/src/uu/printenv/src/printenv.rs +++ b/src/uu/printenv/src/printenv.rs @@ -19,12 +19,12 @@ static OPT_NULL: &str = "null"; static ARG_VARIABLES: &str = "variables"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [VARIABLE]... [OPTION]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/pwd/src/pwd.rs b/src/uu/pwd/src/pwd.rs index f29a3abfa..bfdfafd13 100644 --- a/src/uu/pwd/src/pwd.rs +++ b/src/uu/pwd/src/pwd.rs @@ -34,13 +34,13 @@ pub fn absolute_path(path: &Path) -> io::Result { Ok(path_buf) } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... FILE...", executable!()) } #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/readlink/src/readlink.rs b/src/uu/readlink/src/readlink.rs index 4bfac4630..b86dff162 100644 --- a/src/uu/readlink/src/readlink.rs +++ b/src/uu/readlink/src/readlink.rs @@ -29,12 +29,12 @@ const OPT_ZERO: &str = "zero"; const ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let mut no_newline = matches.is_present(OPT_NO_NEWLINE); diff --git a/src/uu/realpath/src/realpath.rs b/src/uu/realpath/src/realpath.rs index 34b2640ab..494fe41dc 100644 --- a/src/uu/realpath/src/realpath.rs +++ b/src/uu/realpath/src/realpath.rs @@ -22,12 +22,12 @@ static OPT_ZERO: &str = "zero"; static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... FILE...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/relpath/src/relpath.rs b/src/uu/relpath/src/relpath.rs index e27ee0ce9..b7fa8991c 100644 --- a/src/uu/relpath/src/relpath.rs +++ b/src/uu/relpath/src/relpath.rs @@ -25,7 +25,7 @@ mod options { pub const FROM: &str = "FROM"; } -fn get_usage() -> String { +fn usage() -> String { format!("{} [-d DIR] TO [FROM]", executable!()) } @@ -33,7 +33,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index 4c44f59ee..4b435807b 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -52,7 +52,7 @@ static OPT_VERBOSE: &str = "verbose"; static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... FILE...", executable!()) } @@ -74,7 +74,7 @@ fn get_long_usage() -> String { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let long_usage = get_long_usage(); let matches = uu_app() diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs index 3acfca773..880300a7a 100644 --- a/src/uu/rmdir/src/rmdir.rs +++ b/src/uu/rmdir/src/rmdir.rs @@ -26,12 +26,12 @@ static ENOTDIR: i32 = 20; #[cfg(windows)] static ENOTDIR: i32 = 267; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... DIRECTORY...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs index ae81aa71d..2042cf23f 100644 --- a/src/uu/seq/src/seq.rs +++ b/src/uu/seq/src/seq.rs @@ -22,7 +22,7 @@ static OPT_WIDTHS: &str = "widths"; static ARG_NUMBERS: &str = "numbers"; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... LAST {0} [OPTION]... FIRST LAST @@ -86,7 +86,7 @@ impl FromStr for Number { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let numbers = matches.values_of(ARG_NUMBERS).unwrap().collect::>(); diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index 43428caf6..936577f01 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -213,7 +213,7 @@ static ABOUT: &str = "Overwrite the specified FILE(s) repeatedly, in order to ma for even very expensive hardware probing to recover the data. "; -fn get_usage() -> String { +fn usage() -> String { format!("{} [OPTION]... FILE...", executable!()) } @@ -270,7 +270,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let app = uu_app().usage(&usage[..]); diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs index c34d4f7b7..624e65901 100644 --- a/src/uu/sleep/src/sleep.rs +++ b/src/uu/sleep/src/sleep.rs @@ -26,7 +26,7 @@ mod options { pub const NUMBER: &str = "NUMBER"; } -fn get_usage() -> String { +fn usage() -> String { format!( "{0} {1}[SUFFIX]... \n {0} OPTION", executable!(), @@ -36,7 +36,7 @@ fn get_usage() -> String { #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index c31c47eb9..78b6f8b64 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -1055,7 +1055,7 @@ impl FieldSelector { } } -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [FILE]... Write the sorted concatenation of all FILE(s) to standard output. @@ -1081,7 +1081,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let args = args .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let mut settings: GlobalSettings = Default::default(); let matches = match uu_app().usage(&usage[..]).get_matches_from_safe(args) { diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs index 8e7cb5d6d..bc38818b9 100644 --- a/src/uu/split/src/split.rs +++ b/src/uu/split/src/split.rs @@ -36,7 +36,7 @@ static OPT_VERBOSE: &str = "verbose"; static ARG_INPUT: &str = "input"; static ARG_PREFIX: &str = "prefix"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [INPUT [PREFIX]]", NAME) } fn get_long_usage() -> String { @@ -47,12 +47,12 @@ fn get_long_usage() -> String { Output fixed-size pieces of INPUT to PREFIXaa, PREFIX ab, ...; default size is 1000, and default PREFIX is 'x'. With no INPUT, or when INPUT is -, read standard input.", - get_usage() + usage() ) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let long_usage = get_long_usage(); let matches = uu_app() diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index d4e9818d5..4a12e4fb7 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -882,7 +882,7 @@ impl Stater { } } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... FILE...", executable!()) } @@ -945,7 +945,7 @@ for details about the options it supports. } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let long_usage = get_long_usage(); let matches = uu_app() diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs index 60f42102d..bac5040cf 100644 --- a/src/uu/stdbuf/src/stdbuf.rs +++ b/src/uu/stdbuf/src/stdbuf.rs @@ -47,7 +47,7 @@ mod options { pub const COMMAND: &str = "command"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} OPTION... COMMAND", executable!()) } @@ -152,7 +152,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let args = args .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/sync/src/sync.rs b/src/uu/sync/src/sync.rs index 5109bf24b..123167db7 100644 --- a/src/uu/sync/src/sync.rs +++ b/src/uu/sync/src/sync.rs @@ -159,12 +159,12 @@ mod platform { } } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... FILE...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs index bf9334677..2f1b17ebe 100644 --- a/src/uu/tee/src/tee.rs +++ b/src/uu/tee/src/tee.rs @@ -32,12 +32,12 @@ struct Options { files: Vec, } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs index 464414c5e..e0fbe8a54 100644 --- a/src/uu/timeout/src/timeout.rs +++ b/src/uu/timeout/src/timeout.rs @@ -22,7 +22,7 @@ use uucore::InvalidEncodingHandling; static ABOUT: &str = "Start COMMAND, and kill it if still running after DURATION."; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION] DURATION COMMAND...", executable!()) } @@ -100,7 +100,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); let app = uu_app().usage(&usage[..]); diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs index 92c0080fa..bdb65683f 100644 --- a/src/uu/touch/src/touch.rs +++ b/src/uu/touch/src/touch.rs @@ -47,13 +47,13 @@ fn local_tm_to_filetime(tm: time::Tm) -> FileTime { FileTime::from_unix_time(ts.sec as i64, ts.nsec as u32) } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [USER]", executable!()) } #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs index 390511ec4..ddb866393 100644 --- a/src/uu/tr/src/tr.rs +++ b/src/uu/tr/src/tr.rs @@ -228,7 +228,7 @@ fn translate_input( } } -fn get_usage() -> String { +fn usage() -> String { format!("{} [OPTION]... SET1 [SET2]", executable!()) } @@ -243,7 +243,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); let after_help = get_long_usage(); let matches = uu_app() diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs index 7b7a55f33..c5f9fb5b7 100644 --- a/src/uu/truncate/src/truncate.rs +++ b/src/uu/truncate/src/truncate.rs @@ -63,7 +63,7 @@ pub mod options { pub static ARG_FILES: &str = "files"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [FILE]...", executable!()) } @@ -90,7 +90,7 @@ fn get_long_usage() -> String { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let long_usage = get_long_usage(); let matches = uu_app() diff --git a/src/uu/tty/src/tty.rs b/src/uu/tty/src/tty.rs index 7c6f73dd4..df6c43a27 100644 --- a/src/uu/tty/src/tty.rs +++ b/src/uu/tty/src/tty.rs @@ -23,12 +23,12 @@ mod options { pub const SILENT: &str = "silent"; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs index 288ecf105..fd8b4019b 100644 --- a/src/uu/uniq/src/uniq.rs +++ b/src/uu/uniq/src/uniq.rs @@ -221,7 +221,7 @@ fn opt_parsed(opt_name: &str, matches: &ArgMatches) -> Option { }) } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [INPUT [OUTPUT]]...", executable!()) } @@ -235,7 +235,7 @@ fn get_long_usage() -> String { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let long_usage = get_long_usage(); let matches = uu_app() diff --git a/src/uu/unlink/src/unlink.rs b/src/uu/unlink/src/unlink.rs index 5f96cf429..0601b3e54 100644 --- a/src/uu/unlink/src/unlink.rs +++ b/src/uu/unlink/src/unlink.rs @@ -22,7 +22,7 @@ use uucore::InvalidEncodingHandling; static ABOUT: &str = "Unlink the file at [FILE]."; static OPT_PATH: &str = "FILE"; -fn get_usage() -> String { +fn usage() -> String { format!("{} [OPTION]... FILE", executable!()) } @@ -31,7 +31,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs index 06dd93a24..33f3ec965 100644 --- a/src/uu/uptime/src/uptime.rs +++ b/src/uu/uptime/src/uptime.rs @@ -32,12 +32,12 @@ extern "C" { fn GetTickCount() -> uucore::libc::uint32_t; } -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]...", executable!()) } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let (boot_time, user_count) = process_utmpx(); diff --git a/src/uu/users/src/users.rs b/src/uu/users/src/users.rs index 91168644c..3f081f891 100644 --- a/src/uu/users/src/users.rs +++ b/src/uu/users/src/users.rs @@ -18,7 +18,7 @@ static ABOUT: &str = "Print the user names of users currently logged in to the c static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [FILE]", executable!()) } @@ -31,7 +31,7 @@ If FILE is not specified, use {}. /var/log/wtmp as FILE is common.", } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let after_help = get_long_usage(); let matches = uu_app() diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index afdf8b7de..e21eb0b7e 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -95,7 +95,7 @@ pub mod options { static ARG_FILES: &str = "files"; -fn get_usage() -> String { +fn usage() -> String { format!( "{0} [OPTION]... [FILE]... With no FILE, or when FILE is -, read standard input.", @@ -132,7 +132,7 @@ impl Input { } pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = get_usage(); + let usage = usage(); let matches = uu_app().usage(&usage[..]).get_matches_from(args); diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs index 557a4efd6..558d42f1b 100644 --- a/src/uu/who/src/who.rs +++ b/src/uu/who/src/who.rs @@ -44,7 +44,7 @@ static RUNLEVEL_HELP: &str = "print current runlevel"; #[cfg(not(target_os = "linux"))] static RUNLEVEL_HELP: &str = "print current runlevel (This is meaningless on non Linux)"; -fn get_usage() -> String { +fn usage() -> String { format!("{0} [OPTION]... [ FILE | ARG1 ARG2 ]", executable!()) } @@ -61,7 +61,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { .collect_str(InvalidEncodingHandling::Ignore) .accept_any(); - let usage = get_usage(); + let usage = usage(); let after_help = get_long_usage(); let matches = uu_app()