From 252220e9eb5b97719f74e1ed163d88eaa20f8463 Mon Sep 17 00:00:00 2001 From: Michael Debertol Date: Sat, 14 Aug 2021 17:55:14 +0200 Subject: [PATCH] refactor/uucore ~ make util_name and execution_phrase functions Since util_name and execution_phrase no longer rely on features that are only available to macros, they may as well be plain functions. --- src/uu/arch/src/arch.rs | 2 +- src/uu/base32/src/base32.rs | 6 +-- src/uu/base64/src/base64.rs | 4 +- src/uu/basename/src/basename.rs | 8 ++-- src/uu/basenc/src/basenc.rs | 6 +-- src/uu/cat/src/cat.rs | 4 +- src/uu/chcon/src/chcon.rs | 8 ++-- src/uu/chgrp/src/chgrp.rs | 4 +- src/uu/chmod/src/chmod.rs | 4 +- src/uu/chown/src/chown.rs | 4 +- src/uu/chroot/src/chroot.rs | 6 +-- src/uu/cksum/src/cksum.rs | 2 +- src/uu/comm/src/comm.rs | 7 +-- src/uu/cp/src/cp.rs | 8 ++-- src/uu/csplit/src/csplit.rs | 7 ++- src/uu/cut/src/cut.rs | 2 +- src/uu/date/src/date.rs | 5 +-- src/uu/dd/src/dd.rs | 4 +- src/uu/df/src/df.rs | 6 +-- src/uu/dircolors/src/dircolors.rs | 4 +- src/uu/dirname/src/dirname.rs | 4 +- src/uu/du/src/du.rs | 8 ++-- src/uu/echo/src/echo.rs | 2 +- src/uu/expand/src/expand.rs | 4 +- src/uu/expr/src/expr.rs | 4 +- src/uu/factor/src/cli.rs | 2 +- src/uu/false/src/false.rs | 3 +- src/uu/fmt/src/fmt.rs | 4 +- src/uu/fold/src/fold.rs | 2 +- src/uu/groups/src/groups.rs | 4 +- src/uu/hashsum/src/hashsum.rs | 2 +- src/uu/head/src/head.rs | 4 +- src/uu/hostid/src/hostid.rs | 2 +- src/uu/hostname/src/hostname.rs | 4 +- src/uu/id/src/id.rs | 4 +- src/uu/install/src/install.rs | 16 ++++--- src/uu/kill/src/kill.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 | 10 +++-- src/uu/mkfifo/src/mkfifo.rs | 2 +- src/uu/mknod/src/mknod.rs | 16 ++++--- src/uu/mktemp/src/mktemp.rs | 4 +- src/uu/more/src/more.rs | 2 +- src/uu/mv/src/mv.rs | 8 ++-- src/uu/nice/src/nice.rs | 6 +-- src/uu/nl/src/nl.rs | 2 +- src/uu/nohup/src/nohup.rs | 7 ++- src/uu/nproc/src/nproc.rs | 4 +- src/uu/numfmt/src/numfmt.rs | 4 +- src/uu/od/src/multifilereader.rs | 4 +- src/uu/od/src/od.rs | 2 +- src/uu/paste/src/paste.rs | 2 +- src/uu/pathchk/src/pathchk.rs | 6 +-- src/uu/pinky/src/pinky.rs | 4 +- src/uu/pr/src/pr.rs | 3 +- src/uu/printenv/src/printenv.rs | 7 +-- src/uu/printf/src/printf.rs | 11 ++--- src/uu/ptx/src/ptx.rs | 2 +- src/uu/pwd/src/pwd.rs | 4 +- src/uu/readlink/src/readlink.rs | 12 +++--- src/uu/realpath/src/realpath.rs | 4 +- src/uu/relpath/src/relpath.rs | 7 +-- src/uu/rm/src/rm.rs | 6 +-- src/uu/rmdir/src/rmdir.rs | 4 +- src/uu/seq/src/seq.rs | 10 ++--- src/uu/shred/src/shred.rs | 4 +- src/uu/shuf/src/shuf.rs | 2 +- src/uu/sleep/src/sleep.rs | 4 +- src/uu/sort/src/sort.rs | 4 +- src/uu/split/src/split.rs | 7 ++- src/uu/stat/src/stat.rs | 4 +- src/uu/stdbuf/src/stdbuf.rs | 6 +-- src/uu/sum/src/sum.rs | 2 +- src/uu/sync/src/sync.rs | 4 +- src/uu/tac/src/tac.rs | 2 +- src/uu/tail/src/tail.rs | 2 +- src/uu/tee/src/tee.rs | 4 +- src/uu/test/src/test.rs | 3 +- src/uu/timeout/src/timeout.rs | 5 ++- src/uu/touch/src/touch.rs | 4 +- src/uu/tr/src/tr.rs | 8 ++-- src/uu/true/src/true.rs | 3 +- src/uu/truncate/src/truncate.rs | 4 +- src/uu/tsort/src/tsort.rs | 2 +- src/uu/tty/src/tty.rs | 7 +-- src/uu/uname/src/uname.rs | 4 +- src/uu/unexpand/src/unexpand.rs | 2 +- src/uu/uniq/src/uniq.rs | 7 ++- src/uu/unlink/src/unlink.rs | 8 ++-- src/uu/uptime/src/uptime.rs | 4 +- src/uu/users/src/users.rs | 7 +-- src/uu/wc/src/wc.rs | 4 +- src/uu/who/src/who.rs | 7 ++- src/uucore/src/lib/lib.rs | 32 ++++++++++++++ src/uucore/src/lib/macros.rs | 67 +++-------------------------- src/uucore/src/lib/mods/coreopts.rs | 4 +- src/uucore_procs/src/lib.rs | 2 +- 100 files changed, 279 insertions(+), 297 deletions(-) diff --git a/src/uu/arch/src/arch.rs b/src/uu/arch/src/arch.rs index 30adbaad9..478fef6f1 100644 --- a/src/uu/arch/src/arch.rs +++ b/src/uu/arch/src/arch.rs @@ -27,7 +27,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(SUMMARY) diff --git a/src/uu/base32/src/base32.rs b/src/uu/base32/src/base32.rs index 4d6c634e5..ac9ed1075 100644 --- a/src/uu/base32/src/base32.rs +++ b/src/uu/base32/src/base32.rs @@ -29,13 +29,13 @@ static VERSION: &str = env!("CARGO_PKG_VERSION"); static BASE_CMD_PARSE_ERROR: i32 = 1; fn usage() -> String { - format!("{0} [OPTION]... [FILE]", execution_phrase!()) + format!("{0} [OPTION]... [FILE]", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { let format = Format::Base32; let usage = usage(); - let name = util_name!(); + let name = uucore::util_name(); let config_result: Result = base_common::parse_base_cmd_args(args, &name, VERSION, ABOUT, &usage); @@ -59,5 +59,5 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - base_common::base_app(&util_name!(), VERSION, ABOUT) + base_common::base_app(&uucore::util_name(), VERSION, ABOUT) } diff --git a/src/uu/base64/src/base64.rs b/src/uu/base64/src/base64.rs index 689940a07..e303f9d29 100644 --- a/src/uu/base64/src/base64.rs +++ b/src/uu/base64/src/base64.rs @@ -30,13 +30,13 @@ static VERSION: &str = env!("CARGO_PKG_VERSION"); static BASE_CMD_PARSE_ERROR: i32 = 1; fn usage() -> String { - format!("{0} [OPTION]... [FILE]", execution_phrase!()) + format!("{0} [OPTION]... [FILE]", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { let format = Format::Base64; let usage = usage(); - let name = util_name!(); + let name = uucore::util_name(); let config_result: Result = base_common::parse_base_cmd_args(args, &name, VERSION, ABOUT, &usage); let config = config_result.unwrap_or_else(|s| crash!(BASE_CMD_PARSE_ERROR, "{}", s)); diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs index d7aa52289..2d2f649d1 100644 --- a/src/uu/basename/src/basename.rs +++ b/src/uu/basename/src/basename.rs @@ -21,7 +21,7 @@ fn usage() -> String { format!( "{0} NAME [SUFFIX] {0} OPTION... NAME...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -47,7 +47,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { crash!( 1, "{1}\nTry '{0} --help' for more information.", - execution_phrase!(), + uucore::execution_phrase(), "missing operand" ); } @@ -61,7 +61,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { crash!( 1, "extra operand '{1}'\nTry '{0} --help' for more information.", - execution_phrase!(), + uucore::execution_phrase(), matches.values_of(options::NAME).unwrap().nth(2).unwrap() ); } @@ -93,7 +93,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .arg( diff --git a/src/uu/basenc/src/basenc.rs b/src/uu/basenc/src/basenc.rs index ef9779512..2b3193d49 100644 --- a/src/uu/basenc/src/basenc.rs +++ b/src/uu/basenc/src/basenc.rs @@ -43,11 +43,11 @@ const ENCODINGS: &[(&str, Format)] = &[ ]; fn usage() -> String { - format!("{0} [OPTION]... [FILE]", execution_phrase!()) + format!("{0} [OPTION]... [FILE]", uucore::execution_phrase()) } pub fn uu_app() -> App<'static, 'static> { - let mut app = base_common::base_app(&util_name!(), crate_version!(), ABOUT); + let mut app = base_common::base_app(&uucore::util_name(), crate_version!(), ABOUT); for encoding in ENCODINGS { app = app.arg(Arg::with_name(encoding.0).long(encoding.0)); } @@ -75,7 +75,7 @@ fn parse_cmd_args(args: impl uucore::Args) -> (Config, Format) { } pub fn uumain(args: impl uucore::Args) -> i32 { - let name = util_name!(); + let name = uucore::util_name(); let (config, format) = parse_cmd_args(args); // Create a reference to stdin so we can return a locked stdin from // parse_base_cmd_args diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index e0c7d2226..a176b8c5d 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -234,7 +234,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(SYNTAX) @@ -396,7 +396,7 @@ fn cat_files(files: Vec, options: &OutputOptions) -> UResult<()> { Ok(()) } else { // each next line is expected to display "cat: …" - let line_joiner = format!("\n{}: ", util_name!()); + let line_joiner = format!("\n{}: ", uucore::util_name()); Err(uucore::error::USimpleError::new( error_messages.len() as i32, diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs index 6f45dcd92..5f6a80bde 100644 --- a/src/uu/chcon/src/chcon.rs +++ b/src/uu/chcon/src/chcon.rs @@ -2,7 +2,7 @@ #![allow(clippy::upper_case_acronyms)] -use uucore::{execution_phrase, show_error, show_usage_error, show_warning, util_name}; +use uucore::{show_error, show_usage_error, show_warning}; use clap::{App, Arg}; use selinux::{OpaqueSecurityContext, SecurityContext}; @@ -56,7 +56,7 @@ fn get_usage() -> String { "{0} [OPTION]... CONTEXT FILE... \n \ {0} [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE... \n \ {0} [OPTION]... --reference=RFILE FILE...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -152,7 +152,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(VERSION) .about(ABOUT) .arg( @@ -563,7 +563,7 @@ fn process_file( if options.verbose { println!( "{}: Changing security context of: {}", - util_name!(), + uucore::util_name(), file_full_name.to_string_lossy() ); } diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index 5dbcc277e..7840ba829 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -62,7 +62,7 @@ const FTS_LOGICAL: u8 = 1 << 2; fn usage() -> String { format!( "{0} [OPTION]... GROUP FILE...\n {0} [OPTION]... --reference=RFILE FILE...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -197,7 +197,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(VERSION) .about(ABOUT) .arg( diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index 88ad22969..5108ec924 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -41,7 +41,7 @@ fn usage() -> String { "{0} [OPTION]... MODE[,MODE]... FILE... or: {0} [OPTION]... OCTAL-MODE FILE... or: {0} [OPTION]... --reference=RFILE FILE...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -116,7 +116,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs index a7824f248..8813c07e2 100644 --- a/src/uu/chown/src/chown.rs +++ b/src/uu/chown/src/chown.rs @@ -64,7 +64,7 @@ const FTS_LOGICAL: u8 = 1 << 2; fn usage() -> String { format!( "{0} [OPTION]... [OWNER][:[GROUP]] FILE...\n{0} [OPTION]... --reference=RFILE FILE...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -165,7 +165,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs index 71a12b052..c0f392913 100644 --- a/src/uu/chroot/src/chroot.rs +++ b/src/uu/chroot/src/chroot.rs @@ -16,7 +16,7 @@ use std::io::Error; use std::path::Path; use std::process::Command; use uucore::libc::{self, chroot, setgid, setgroups, setuid}; -use uucore::{entries, execution_phrase, InvalidEncodingHandling}; +use uucore::{entries, InvalidEncodingHandling}; static ABOUT: &str = "Run COMMAND with root directory set to NEWROOT."; static SYNTAX: &str = "[OPTION]... NEWROOT [COMMAND [ARG]...]"; @@ -46,7 +46,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { None => crash!( 1, "Missing operand: NEWROOT\nTry '{} --help' for more information.", - execution_phrase!() + uucore::execution_phrase() ), }; @@ -91,7 +91,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .usage(SYNTAX) diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs index 8173fa451..a5beec368 100644 --- a/src/uu/cksum/src/cksum.rs +++ b/src/uu/cksum/src/cksum.rs @@ -213,7 +213,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .about(SUMMARY) diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs index 02c5598be..56af42fd9 100644 --- a/src/uu/comm/src/comm.rs +++ b/src/uu/comm/src/comm.rs @@ -7,9 +7,6 @@ // spell-checker:ignore (ToDO) delim mkdelim -#[macro_use] -extern crate uucore; - use std::cmp::Ordering; use std::fs::File; use std::io::{self, stdin, BufRead, BufReader, Stdin}; @@ -32,7 +29,7 @@ mod options { } fn usage() -> String { - format!("{} [OPTION]... FILE1 FILE2", execution_phrase!()) + format!("{} [OPTION]... FILE1 FILE2", uucore::execution_phrase()) } fn mkdelim(col: usize, opts: &ArgMatches) -> String { @@ -148,7 +145,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index a3b3db9a5..01d7d11be 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -99,7 +99,7 @@ quick_error! { NotImplemented(opt: String) { display("Option '{}' not yet implemented.", opt) } /// Invalid arguments to backup - Backup(description: String) { display("{}\nTry '{} --help' for more information.", description, execution_phrase!()) } + Backup(description: String) { display("{}\nTry '{} --help' for more information.", description, uucore::execution_phrase()) } } } @@ -223,7 +223,7 @@ fn usage() -> String { "{0} [OPTION]... [-T] SOURCE DEST {0} [OPTION]... SOURCE... DIRECTORY {0} [OPTION]... -t DIRECTORY SOURCE...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -293,7 +293,7 @@ static DEFAULT_ATTRIBUTES: &[Attribute] = &[ ]; pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg(Arg::with_name(options::TARGET_DIRECTORY) @@ -1060,7 +1060,7 @@ impl OverwriteMode { match *self { OverwriteMode::NoClobber => Err(Error::NotAllFilesCopied), OverwriteMode::Interactive(_) => { - if prompt_yes!("{}: overwrite {}? ", util_name!(), path.display()) { + if prompt_yes!("{}: overwrite {}? ", uucore::util_name(), path.display()) { Ok(()) } else { Err(Error::Skipped(format!( diff --git a/src/uu/csplit/src/csplit.rs b/src/uu/csplit/src/csplit.rs index c89d06cf3..9e93bbe42 100644 --- a/src/uu/csplit/src/csplit.rs +++ b/src/uu/csplit/src/csplit.rs @@ -35,7 +35,10 @@ mod options { } fn usage() -> String { - format!("{0} [OPTION]... FILE PATTERN...", execution_phrase!()) + format!( + "{0} [OPTION]... FILE PATTERN...", + uucore::execution_phrase() + ) } /// Command line options for csplit. @@ -739,7 +742,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .arg( diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index 6410b9efc..783502e3d 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -548,7 +548,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(SYNTAX) diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index 3d2a8c6d0..7bf6298c0 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -8,9 +8,6 @@ // spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes -#[macro_use] -extern crate uucore; - use chrono::{DateTime, FixedOffset, Local, Offset, Utc}; #[cfg(windows)] use chrono::{Datelike, Timelike}; @@ -253,7 +250,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs index 660f62f7a..c339398e6 100644 --- a/src/uu/dd/src/dd.rs +++ b/src/uu/dd/src/dd.rs @@ -7,8 +7,6 @@ // spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat -#[macro_use] -extern crate uucore; use uucore::InvalidEncodingHandling; #[cfg(test)] @@ -1046,7 +1044,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> clap::App<'static, 'static> { - clap::App::new(util_name!()) + clap::App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs index 52fae4702..e7f3944a0 100644 --- a/src/uu/df/src/df.rs +++ b/src/uu/df/src/df.rs @@ -80,7 +80,7 @@ struct Filesystem { } fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } impl FsSelector { @@ -295,7 +295,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { #[cfg(windows)] { if matches.is_present(OPT_INODES) { - println!("{}: doesn't support -i option", util_name!()); + println!("{}: doesn't support -i option", uucore::util_name()); return Ok(()); } } @@ -427,7 +427,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs index c70fd97ee..2b9c25ba3 100644 --- a/src/uu/dircolors/src/dircolors.rs +++ b/src/uu/dircolors/src/dircolors.rs @@ -63,7 +63,7 @@ pub fn guess_syntax() -> OutputFmt { } fn usage() -> String { - format!("{0} {1}", execution_phrase!(), SYNTAX) + format!("{0} {1}", uucore::execution_phrase(), SYNTAX) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -153,7 +153,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .after_help(LONG_HELP) diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index 4600d67ac..3e91d598a 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -21,7 +21,7 @@ mod options { } fn usage() -> String { - format!("{0} [OPTION] NAME...", execution_phrase!()) + format!("{0} [OPTION] NAME...", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -86,7 +86,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .about(ABOUT) .version(crate_version!()) .arg( diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 52750cb95..258d58bae 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -396,7 +396,7 @@ fn usage() -> String { format!( "{0} [OPTION]... [FILE]... {0} [OPTION]... --files0-from=F", - execution_phrase!() + uucore::execution_phrase() ) } @@ -424,7 +424,7 @@ Valid arguments are: - 'iso' Try '{} --help' for more information.", s, - execution_phrase!() + uucore::execution_phrase() ), DuError::InvalidTimeArg(s) => write!( f, @@ -466,7 +466,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let options = Options { all: matches.is_present(options::ALL), - util_name: util_name!(), + util_name: uucore::util_name(), max_depth, total: matches.is_present(options::TOTAL), separate_dirs: matches.is_present(options::SEPARATE_DIRS), @@ -625,7 +625,7 @@ fn parse_depth(max_depth_str: Option<&str>, summarize: bool) -> UResult App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .after_help(LONG_HELP) diff --git a/src/uu/echo/src/echo.rs b/src/uu/echo/src/echo.rs index d34460df0..601fd8d48 100644 --- a/src/uu/echo/src/echo.rs +++ b/src/uu/echo/src/echo.rs @@ -132,7 +132,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) // TrailingVarArg specifies the final positional argument is a VarArg // and it doesn't attempts the parse any further args. diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs index 0cd4b2719..04cb42649 100644 --- a/src/uu/expand/src/expand.rs +++ b/src/uu/expand/src/expand.rs @@ -33,7 +33,7 @@ static LONG_HELP: &str = ""; static DEFAULT_TABSTOP: usize = 8; fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } /// The mode to use when replacing tabs beyond the last one specified in @@ -178,7 +178,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) diff --git a/src/uu/expr/src/expr.rs b/src/uu/expr/src/expr.rs index 0a9d76f67..2d82300ff 100644 --- a/src/uu/expr/src/expr.rs +++ b/src/uu/expr/src/expr.rs @@ -18,7 +18,7 @@ const VERSION: &str = "version"; const HELP: &str = "help"; pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .arg(Arg::with_name(VERSION).long(VERSION)) .arg(Arg::with_name(HELP).long(HELP)) } @@ -140,5 +140,5 @@ Environment variables: } fn print_version() { - println!("{} {}", util_name!(), crate_version!()); + println!("{} {}", uucore::util_name(), crate_version!()); } diff --git a/src/uu/factor/src/cli.rs b/src/uu/factor/src/cli.rs index 628ded969..95b8bb866 100644 --- a/src/uu/factor/src/cli.rs +++ b/src/uu/factor/src/cli.rs @@ -75,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) .arg(Arg::with_name(options::NUMBER).multiple(true)) diff --git a/src/uu/false/src/false.rs b/src/uu/false/src/false.rs index 8f7710912..88ec1af06 100644 --- a/src/uu/false/src/false.rs +++ b/src/uu/false/src/false.rs @@ -10,7 +10,6 @@ extern crate uucore; use clap::App; use uucore::error::UResult; -use uucore::util_name; #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -19,5 +18,5 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) } diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs index d42151503..5203745a1 100644 --- a/src/uu/fmt/src/fmt.rs +++ b/src/uu/fmt/src/fmt.rs @@ -51,7 +51,7 @@ static OPT_TAB_WIDTH: &str = "tab-width"; static ARG_FILES: &str = "files"; fn usage() -> String { - format!("{} [OPTION]... [FILE]...", execution_phrase!()) + format!("{} [OPTION]... [FILE]...", uucore::execution_phrase()) } pub type FileOrStdReader = BufReader>; @@ -211,7 +211,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs index a2321d5ee..c5628125d 100644 --- a/src/uu/fold/src/fold.rs +++ b/src/uu/fold/src/fold.rs @@ -64,7 +64,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(SYNTAX) diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index 83be0932b..c2af5c4b0 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -29,7 +29,7 @@ static ABOUT: &str = "Print group memberships for each USERNAME or, \ (which may differ if the groups data‐base has changed)."; fn usage() -> String { - format!("{0} [OPTION]... [USERNAME]...", execution_phrase!()) + format!("{0} [OPTION]... [USERNAME]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -85,7 +85,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index 332e08009..77cc0d558 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -342,7 +342,7 @@ pub fn uu_app_common() -> App<'static, 'static> { const TEXT_HELP: &str = "read in text mode"; #[cfg(not(windows))] const TEXT_HELP: &str = "read in text mode (default)"; - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about("Compute and check message digests.") .arg( diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs index 11ea56449..e47488ac4 100644 --- a/src/uu/head/src/head.rs +++ b/src/uu/head/src/head.rs @@ -9,7 +9,7 @@ use clap::{crate_version, App, Arg}; use std::convert::TryFrom; use std::ffi::OsString; use std::io::{self, ErrorKind, Read, Seek, SeekFrom, Write}; -use uucore::{crash, show_error_custom_description, util_name}; +use uucore::{crash, show_error_custom_description}; const EXIT_FAILURE: i32 = 1; const EXIT_SUCCESS: i32 = 0; @@ -41,7 +41,7 @@ use lines::zlines; use take::take_all_but; pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .usage(USAGE) diff --git a/src/uu/hostid/src/hostid.rs b/src/uu/hostid/src/hostid.rs index e593ff7ee..4c9cafa35 100644 --- a/src/uu/hostid/src/hostid.rs +++ b/src/uu/hostid/src/hostid.rs @@ -29,7 +29,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .usage(SYNTAX) } diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs index 2dc68abfb..8852e0f43 100644 --- a/src/uu/hostname/src/hostname.rs +++ b/src/uu/hostname/src/hostname.rs @@ -54,7 +54,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } fn usage() -> String { - format!("{0} [OPTION]... [HOSTNAME]", execution_phrase!()) + format!("{0} [OPTION]... [HOSTNAME]", uucore::execution_phrase()) } fn execute(args: impl uucore::Args) -> UResult<()> { @@ -74,7 +74,7 @@ fn execute(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs index 74523213e..4e8e30e52 100644 --- a/src/uu/id/src/id.rs +++ b/src/uu/id/src/id.rs @@ -77,7 +77,7 @@ mod options { } fn usage() -> String { - format!("{0} [OPTION]... [USER]...", execution_phrase!()) + format!("{0} [OPTION]... [USER]...", uucore::execution_phrase()) } fn get_description() -> String { @@ -347,7 +347,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index a1c6d4225..5c951ad5b 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -86,11 +86,13 @@ impl Display for InstallError { use InstallError as IE; match self { IE::Unimplemented(opt) => write!(f, "Unimplemented feature: {}", opt), - IE::DirNeedsArg() => write!( - f, - "{} with -d requires at least one argument.", - util_name!() - ), + IE::DirNeedsArg() => { + write!( + f, + "{} with -d requires at least one argument.", + uucore::util_name() + ) + } IE::CreateDirFailed(dir, e) => { Display::fmt(&uio_error!(e, "failed to create {}", dir.display()), f) } @@ -173,7 +175,7 @@ static OPT_CONTEXT: &str = "context"; static ARG_FILES: &str = "files"; fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } /// Main install utility function, called from main.rs. @@ -202,7 +204,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs index 08dff87d4..47bd97dbc 100644 --- a/src/uu/kill/src/kill.rs +++ b/src/uu/kill/src/kill.rs @@ -41,7 +41,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .accept_any(); let (args, obs_signal) = handle_obsolete(args); - let usage = format!("{} [OPTIONS]... PID...", execution_phrase!()); + let usage = format!("{} [OPTIONS]... PID...", uucore::execution_phrase()); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let mode = if matches.is_present(options::TABLE) || matches.is_present(options::TABLE_OLD) { @@ -76,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/link/src/link.rs b/src/uu/link/src/link.rs index 03dd46aee..73e81b107 100644 --- a/src/uu/link/src/link.rs +++ b/src/uu/link/src/link.rs @@ -20,7 +20,7 @@ pub mod options { } fn usage() -> String { - format!("{0} FILE1 FILE2", execution_phrase!()) + format!("{0} FILE1 FILE2", uucore::execution_phrase()) } pub fn normalize_error_message(e: Error) -> String { @@ -51,7 +51,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index 817aa91cb..c24db2172 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -70,7 +70,7 @@ impl Display for LnError { f, "extra operand '{}'\nTry '{} --help' for more information.", s, - execution_phrase!() + uucore::execution_phrase() ), Self::InvalidBackupMode(s) => write!(f, "{}", s), } @@ -98,7 +98,7 @@ fn usage() -> String { {0} [OPTION]... TARGET (2nd form) {0} [OPTION]... TARGET... DIRECTORY (3rd form) {0} [OPTION]... -t DIRECTORY TARGET... (4th form)", - execution_phrase!() + uucore::execution_phrase() ) } @@ -196,7 +196,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( @@ -431,7 +431,7 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> Result<()> { match settings.overwrite { OverwriteMode::NoClobber => {} OverwriteMode::Interactive => { - print!("{}: overwrite '{}'? ", util_name!(), dst.display()); + print!("{}: overwrite '{}'? ", uucore::util_name(), dst.display()); if !read_yes() { return Ok(()); } diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs index 1a69543c1..f8dd3fc5d 100644 --- a/src/uu/logname/src/logname.rs +++ b/src/uu/logname/src/logname.rs @@ -36,7 +36,7 @@ fn get_userlogin() -> Option { static SUMMARY: &str = "Print user's login name"; fn usage() -> String { - execution_phrase!() + uucore::execution_phrase() } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -56,7 +56,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(SUMMARY) } diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 6ba3ec4f1..da8955152 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -47,7 +47,7 @@ use uucore::libc::{S_IXGRP, S_IXOTH, S_IXUSR}; use uucore::{fs::display_permissions, version_cmp::version_cmp}; fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } pub mod options { @@ -618,7 +618,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about( "By default, ls will list the files and contents of any directories on \ diff --git a/src/uu/mkdir/src/mkdir.rs b/src/uu/mkdir/src/mkdir.rs index 046628f3a..848f79988 100644 --- a/src/uu/mkdir/src/mkdir.rs +++ b/src/uu/mkdir/src/mkdir.rs @@ -23,7 +23,7 @@ mod options { } fn usage() -> String { - format!("{0} [OPTION]... [USER]", execution_phrase!()) + format!("{0} [OPTION]... [USER]", uucore::execution_phrase()) } #[uucore_procs::gen_uumain] @@ -51,7 +51,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( @@ -103,7 +103,11 @@ fn mkdir(path: &Path, recursive: bool, mode: u16, verbose: bool) -> UResult<()> create_dir(path).map_err_context(|| format!("cannot create directory '{}'", path.display()))?; if verbose { - println!("{}: created directory '{}'", util_name!(), path.display()); + println!( + "{}: created directory '{}'", + uucore::util_name(), + path.display() + ); } chmod(path, mode) diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs index 10ea8337c..009675811 100644 --- a/src/uu/mkfifo/src/mkfifo.rs +++ b/src/uu/mkfifo/src/mkfifo.rs @@ -70,7 +70,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(USAGE) diff --git a/src/uu/mknod/src/mknod.rs b/src/uu/mknod/src/mknod.rs index 1a52de14f..f8fb9c469 100644 --- a/src/uu/mknod/src/mknod.rs +++ b/src/uu/mknod/src/mknod.rs @@ -71,8 +71,8 @@ fn _mknod(file_name: &str, mode: mode_t, dev: dev_t) -> i32 { } if errno == -1 { - let c_str = - CString::new(execution_phrase!().as_bytes()).expect("Failed to convert to CString"); + let c_str = CString::new(uucore::execution_phrase().as_bytes()) + .expect("Failed to convert to CString"); // shows the error from the mknod syscall libc::perror(c_str.as_ptr()); } @@ -113,7 +113,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if ch == 'p' { if matches.is_present("major") || matches.is_present("minor") { eprintln!("Fifos do not have major and minor device numbers."); - eprintln!("Try '{} --help' for more information.", execution_phrase!()); + eprintln!( + "Try '{} --help' for more information.", + uucore::execution_phrase() + ); 1 } else { _mknod(file_name, S_IFIFO | mode, 0) @@ -122,7 +125,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 { match (matches.value_of("major"), matches.value_of("minor")) { (None, None) | (_, None) | (None, _) => { eprintln!("Special files require major and minor device numbers."); - eprintln!("Try '{} --help' for more information.", execution_phrase!()); + eprintln!( + "Try '{} --help' for more information.", + uucore::execution_phrase() + ); 1 } (Some(major), Some(minor)) => { @@ -145,7 +151,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .usage(USAGE) .after_help(LONG_HELP) diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs index 2d42d38ba..0b30f0087 100644 --- a/src/uu/mktemp/src/mktemp.rs +++ b/src/uu/mktemp/src/mktemp.rs @@ -37,7 +37,7 @@ static OPT_T: &str = "t"; static ARG_TEMPLATE: &str = "template"; fn usage() -> String { - format!("{0} [OPTION]... [TEMPLATE]", execution_phrase!()) + format!("{0} [OPTION]... [TEMPLATE]", uucore::execution_phrase()) } #[derive(Debug)] @@ -134,7 +134,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/more/src/more.rs b/src/uu/more/src/more.rs index ee03c0d8a..8097d1402 100644 --- a/src/uu/more/src/more.rs +++ b/src/uu/more/src/more.rs @@ -93,7 +93,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .about("A file perusal filter for CRT viewing.") .version(crate_version!()) .arg( diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index 1cf45c36a..5f825113b 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -63,7 +63,7 @@ fn usage() -> String { "{0} [OPTION]... [-T] SOURCE DEST {0} [OPTION]... SOURCE... DIRECTORY {0} [OPTION]... -t DIRECTORY SOURCE...", - execution_phrase!() + uucore::execution_phrase() ) } @@ -133,7 +133,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( @@ -296,7 +296,7 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 { "mv: extra operand '{}'\n\ Try '{} --help' for more information.", files[2].display(), - execution_phrase!() + uucore::execution_phrase() ); return 1; } @@ -353,7 +353,7 @@ fn rename(from: &Path, to: &Path, b: &Behavior) -> io::Result<()> { match b.overwrite { OverwriteMode::NoClobber => return Ok(()), OverwriteMode::Interactive => { - println!("{}: overwrite '{}'? ", util_name!(), to.display()); + println!("{}: overwrite '{}'? ", uucore::util_name(), to.display()); if !read_yes() { return Ok(()); } diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index a93137c10..fbc2be0e5 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -31,7 +31,7 @@ Run COMMAND with an adjusted niceness, which affects process scheduling. With no COMMAND, print the current niceness. Niceness values range from at least -20 (most favorable to the process) to 19 (least favorable to the process).", - execution_phrase!() + uucore::execution_phrase() ) } @@ -54,7 +54,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if !matches.is_present(options::COMMAND) { show_error!( "A command must be given with an adjustment.\nTry '{} --help' for more information.", - execution_phrase!() + uucore::execution_phrase() ); return 125; } @@ -101,7 +101,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .setting(AppSettings::TrailingVarArg) .version(crate_version!()) .arg( diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index d5ea18f8a..600ebace0 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -143,7 +143,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(USAGE) diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs index 17b06301f..1ecb9914f 100644 --- a/src/uu/nohup/src/nohup.rs +++ b/src/uu/nohup/src/nohup.rs @@ -71,7 +71,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) @@ -157,7 +157,10 @@ fn find_stdout() -> File { } fn usage() -> String { - format!("{0} COMMAND [ARG]...\n {0} FLAG", execution_phrase!()) + format!( + "{0} COMMAND [ARG]...\n {0} FLAG", + uucore::execution_phrase() + ) } #[cfg(target_vendor = "apple")] diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs index c10d79d40..16b8d8c3a 100644 --- a/src/uu/nproc/src/nproc.rs +++ b/src/uu/nproc/src/nproc.rs @@ -28,7 +28,7 @@ static OPT_IGNORE: &str = "ignore"; static ABOUT: &str = "Print the number of cores available to the current process."; fn usage() -> String { - format!("{0} [OPTIONS]...", execution_phrase!()) + format!("{0} [OPTIONS]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -70,7 +70,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/numfmt/src/numfmt.rs b/src/uu/numfmt/src/numfmt.rs index 849abeb71..1798975dc 100644 --- a/src/uu/numfmt/src/numfmt.rs +++ b/src/uu/numfmt/src/numfmt.rs @@ -51,7 +51,7 @@ Multiple fields/ranges can be separated with commas "; fn usage() -> String { - format!("{0} [OPTION]... [NUMBER]...", execution_phrase!()) + format!("{0} [OPTION]... [NUMBER]...", uucore::execution_phrase()) } fn handle_args<'a>(args: impl Iterator, options: NumfmtOptions) -> Result<()> { @@ -175,7 +175,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) diff --git a/src/uu/od/src/multifilereader.rs b/src/uu/od/src/multifilereader.rs index 303093b01..2f44da803 100644 --- a/src/uu/od/src/multifilereader.rs +++ b/src/uu/od/src/multifilereader.rs @@ -57,7 +57,7 @@ impl<'b> MultifileReader<'b> { // print an error at the time that the file is needed, // then move on the the next file. // This matches the behavior of the original `od` - eprintln!("{}: '{}': {}", util_name!(), fname, e); + eprintln!("{}: '{}': {}", uucore::util_name(), fname, e); self.any_err = true } } @@ -90,7 +90,7 @@ impl<'b> io::Read for MultifileReader<'b> { Ok(0) => break, Ok(n) => n, Err(e) => { - eprintln!("{}: I/O: {}", util_name!(), e); + eprintln!("{}: I/O: {}", uucore::util_name(), e); self.any_err = true; break; } diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs index b37990fd5..6c1110362 100644 --- a/src/uu/od/src/od.rs +++ b/src/uu/od/src/od.rs @@ -252,7 +252,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> clap::App<'static, 'static> { - clap::App::new(util_name!()) + clap::App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .usage(USAGE) diff --git a/src/uu/paste/src/paste.rs b/src/uu/paste/src/paste.rs index 801de50dc..9ac5507df 100644 --- a/src/uu/paste/src/paste.rs +++ b/src/uu/paste/src/paste.rs @@ -52,7 +52,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/pathchk/src/pathchk.rs b/src/uu/pathchk/src/pathchk.rs index c1ea76bf9..863bb6bf2 100644 --- a/src/uu/pathchk/src/pathchk.rs +++ b/src/uu/pathchk/src/pathchk.rs @@ -39,7 +39,7 @@ const POSIX_PATH_MAX: usize = 256; const POSIX_NAME_MAX: usize = 14; fn usage() -> String { - format!("{0} [OPTION]... NAME...", execution_phrase!()) + format!("{0} [OPTION]... NAME...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -70,7 +70,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let mut res = if paths.is_none() { show_error!( "missing operand\nTry '{} --help' for more information", - execution_phrase!() + uucore::execution_phrase() ); false } else { @@ -98,7 +98,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs index 9268ffd2b..02573c994 100644 --- a/src/uu/pinky/src/pinky.rs +++ b/src/uu/pinky/src/pinky.rs @@ -41,7 +41,7 @@ mod options { } fn usage() -> String { - format!("{0} [OPTION]... [USER]...", execution_phrase!()) + format!("{0} [OPTION]... [USER]...", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -130,7 +130,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs index 9ee5158ec..1358cef6c 100644 --- a/src/uu/pr/src/pr.rs +++ b/src/uu/pr/src/pr.rs @@ -23,7 +23,6 @@ use std::fs::{metadata, File}; use std::io::{stdin, stdout, BufRead, BufReader, Lines, Read, Stdout, Write}; #[cfg(unix)] use std::os::unix::fs::FileTypeExt; -use uucore::util_name; type IOError = std::io::Error; @@ -170,7 +169,7 @@ quick_error! { pub fn uu_app() -> clap::App<'static, 'static> { // TODO: migrate to clap to get more shell completions - clap::App::new(util_name!()) + clap::App::new(uucore::util_name()) } pub fn uumain(args: impl uucore::Args) -> i32 { diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs index da46f7667..5d32cfbcc 100644 --- a/src/uu/printenv/src/printenv.rs +++ b/src/uu/printenv/src/printenv.rs @@ -7,9 +7,6 @@ /* last synced with: printenv (GNU coreutils) 8.13 */ -#[macro_use] -extern crate uucore; - use clap::{crate_version, App, Arg}; use std::env; @@ -20,7 +17,7 @@ static OPT_NULL: &str = "null"; static ARG_VARIABLES: &str = "variables"; fn usage() -> String { - format!("{0} [VARIABLE]... [OPTION]...", execution_phrase!()) + format!("{0} [VARIABLE]... [OPTION]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -55,7 +52,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/printf/src/printf.rs b/src/uu/printf/src/printf.rs index 22e02ffe2..d3c8dca90 100644 --- a/src/uu/printf/src/printf.rs +++ b/src/uu/printf/src/printf.rs @@ -2,9 +2,6 @@ // spell-checker:ignore (change!) each's // spell-checker:ignore (ToDO) LONGHELP FORMATSTRING templating parameterizing formatstr -#[macro_use] -extern crate uucore; - use clap::{crate_version, App, Arg}; use uucore::InvalidEncodingHandling; @@ -284,8 +281,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if args.len() <= 1 { println!( "{0}: missing operand\nTry '{1} --help' for more information.", - util_name!(), - execution_phrase!() + uucore::util_name(), + uucore::execution_phrase() ); return 1; } @@ -294,7 +291,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if formatstr == "--help" { print!("{} {}", LONGHELP_LEAD, LONGHELP_BODY); } else if formatstr == "--version" { - println!("{} {}", util_name!(), crate_version!()); + println!("{} {}", uucore::util_name(), crate_version!()); } else { let printf_args = &args[2..]; memo::Memo::run_all(formatstr, printf_args); @@ -303,7 +300,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .arg(Arg::with_name(VERSION).long(VERSION)) .arg(Arg::with_name(HELP).long(HELP)) } diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 4f16af470..264a37d72 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -659,7 +659,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(BRIEF) diff --git a/src/uu/pwd/src/pwd.rs b/src/uu/pwd/src/pwd.rs index 388a10463..75dc637e6 100644 --- a/src/uu/pwd/src/pwd.rs +++ b/src/uu/pwd/src/pwd.rs @@ -35,7 +35,7 @@ pub fn absolute_path(path: &Path) -> io::Result { } fn usage() -> String { - format!("{0} [OPTION]... FILE...", execution_phrase!()) + format!("{0} [OPTION]... FILE...", uucore::execution_phrase()) } #[uucore_procs::gen_uumain] @@ -66,7 +66,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/readlink/src/readlink.rs b/src/uu/readlink/src/readlink.rs index 81d8376f6..aab368af1 100644 --- a/src/uu/readlink/src/readlink.rs +++ b/src/uu/readlink/src/readlink.rs @@ -29,7 +29,7 @@ const OPT_ZERO: &str = "zero"; const ARG_FILES: &str = "files"; fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -59,14 +59,14 @@ pub fn uumain(args: impl uucore::Args) -> i32 { crash!( 1, "missing operand\nTry '{} --help' for more information", - execution_phrase!() + uucore::execution_phrase() ); } if no_newline && files.len() > 1 && !silent { eprintln!( "{}: ignoring --no-newline with multiple arguments", - util_name!() + uucore::util_name() ); no_newline = false; } @@ -80,7 +80,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if verbose { eprintln!( "{}: {}: errno {}", - util_name!(), + uucore::util_name(), f, err.raw_os_error().unwrap() ); @@ -95,7 +95,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if verbose { eprintln!( "{}: {}: errno {:?}", - util_name!(), + uucore::util_name(), f, err.raw_os_error().unwrap() ); @@ -110,7 +110,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/realpath/src/realpath.rs b/src/uu/realpath/src/realpath.rs index 7ce8fc179..b12fef3d9 100644 --- a/src/uu/realpath/src/realpath.rs +++ b/src/uu/realpath/src/realpath.rs @@ -23,7 +23,7 @@ static OPT_ZERO: &str = "zero"; static ARG_FILES: &str = "files"; fn usage() -> String { - format!("{0} [OPTION]... FILE...", execution_phrase!()) + format!("{0} [OPTION]... FILE...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -55,7 +55,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/relpath/src/relpath.rs b/src/uu/relpath/src/relpath.rs index 941a6a3f2..1878e2efa 100644 --- a/src/uu/relpath/src/relpath.rs +++ b/src/uu/relpath/src/relpath.rs @@ -7,9 +7,6 @@ // spell-checker:ignore (ToDO) subpath absto absfrom absbase -#[macro_use] -extern crate uucore; - use clap::{crate_version, App, Arg}; use std::env; use std::path::{Path, PathBuf}; @@ -26,7 +23,7 @@ mod options { } fn usage() -> String { - format!("{} [-d DIR] TO [FROM]", execution_phrase!()) + format!("{} [-d DIR] TO [FROM]", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -82,7 +79,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index 03977bc3e..0613ff857 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -53,7 +53,7 @@ static OPT_VERBOSE: &str = "verbose"; static ARG_FILES: &str = "files"; fn usage() -> String { - format!("{0} [OPTION]... FILE...", execution_phrase!()) + format!("{0} [OPTION]... FILE...", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -93,7 +93,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { // Still check by hand and not use clap // Because "rm -f" is a thing show_error!("missing an argument"); - show_error!("for help, try '{0} --help'", execution_phrase!()); + show_error!("for help, try '{0} --help'", uucore::execution_phrase()); return 1; } else { let options = Options { @@ -140,7 +140,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs index 135350a8e..cafd8e982 100644 --- a/src/uu/rmdir/src/rmdir.rs +++ b/src/uu/rmdir/src/rmdir.rs @@ -27,7 +27,7 @@ static ENOTDIR: i32 = 20; static ENOTDIR: i32 = 267; fn usage() -> String { - format!("{0} [OPTION]... DIRECTORY...", execution_phrase!()) + format!("{0} [OPTION]... DIRECTORY...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -53,7 +53,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs index db5537b8b..05388e7a1 100644 --- a/src/uu/seq/src/seq.rs +++ b/src/uu/seq/src/seq.rs @@ -27,7 +27,7 @@ fn usage() -> String { "{0} [OPTION]... LAST {0} [OPTION]... FIRST LAST {0} [OPTION]... FIRST INCREMENT LAST", - execution_phrase!() + uucore::execution_phrase() ) } #[derive(Clone)] @@ -72,13 +72,13 @@ impl FromStr for Number { Ok(value) if value.is_nan() => Err(format!( "invalid 'not-a-number' argument: '{}'\nTry '{} --help' for more information.", s, - execution_phrase!(), + uucore::execution_phrase(), )), Ok(value) => Ok(Number::F64(value)), Err(_) => Err(format!( "invalid floating point argument: '{}'\nTry '{} --help' for more information.", s, - execution_phrase!(), + uucore::execution_phrase(), )), }, } @@ -123,7 +123,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { show_error!( "invalid Zero increment value: '{}'\nTry '{} --help' for more information.", numbers[1], - execution_phrase!() + uucore::execution_phrase() ); return 1; } @@ -163,7 +163,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .setting(AppSettings::AllowLeadingHyphen) .version(crate_version!()) .about(ABOUT) diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index 521cb8dc6..25cf704bf 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -214,7 +214,7 @@ for even very expensive hardware probing to recover the data. "; fn usage() -> String { - format!("{} [OPTION]... FILE...", execution_phrase!()) + format!("{} [OPTION]... FILE...", uucore::execution_phrase()) } static AFTER_HELP: &str = @@ -330,7 +330,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(AFTER_HELP) diff --git a/src/uu/shuf/src/shuf.rs b/src/uu/shuf/src/shuf.rs index 7f69a5fe9..a193b702b 100644 --- a/src/uu/shuf/src/shuf.rs +++ b/src/uu/shuf/src/shuf.rs @@ -115,7 +115,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .template(TEMPLATE) diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs index 136d92e4d..a70a524c4 100644 --- a/src/uu/sleep/src/sleep.rs +++ b/src/uu/sleep/src/sleep.rs @@ -29,7 +29,7 @@ mod options { fn usage() -> String { format!( "{0} {1}[SUFFIX]... \n {0} OPTION", - execution_phrase!(), + uucore::execution_phrase(), options::NUMBER ) } @@ -49,7 +49,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index 049be5352..9aae23bb8 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -1060,7 +1060,7 @@ fn usage() -> String { Write the sorted concatenation of all FILE(s) to standard output. Mandatory arguments for long options are mandatory for short options too. With no FILE, or when FILE is -, read standard input.", - execution_phrase!() + uucore::execution_phrase() ) } @@ -1286,7 +1286,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs index ce21361af..070df81f6 100644 --- a/src/uu/split/src/split.rs +++ b/src/uu/split/src/split.rs @@ -35,7 +35,10 @@ static ARG_INPUT: &str = "input"; static ARG_PREFIX: &str = "prefix"; fn usage() -> String { - format!("{0} [OPTION]... [INPUT [PREFIX]]", execution_phrase!()) + format!( + "{0} [OPTION]... [INPUT [PREFIX]]", + uucore::execution_phrase() + ) } fn get_long_usage() -> String { format!( @@ -125,7 +128,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about("Create output files containing consecutive or interleaved sections of input") // strategy (mutually exclusive) diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index d3783d725..d017999b4 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -883,7 +883,7 @@ impl Stater { } fn usage() -> String { - format!("{0} [OPTION]... FILE...", execution_phrase!()) + format!("{0} [OPTION]... FILE...", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -963,7 +963,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs index a16a40ce5..e87b3a225 100644 --- a/src/uu/stdbuf/src/stdbuf.rs +++ b/src/uu/stdbuf/src/stdbuf.rs @@ -48,7 +48,7 @@ mod options { } fn usage() -> String { - format!("{0} OPTION... COMMAND", execution_phrase!()) + format!("{0} OPTION... COMMAND", uucore::execution_phrase()) } const STDBUF_INJECT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/libstdbuf.so")); @@ -161,7 +161,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { 125, "{}\nTry '{} --help' for more information.", e.0, - execution_phrase!() + uucore::execution_phrase() ) }); @@ -191,7 +191,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help(LONG_HELP) diff --git a/src/uu/sum/src/sum.rs b/src/uu/sum/src/sum.rs index b4b2294aa..f1147ca2e 100644 --- a/src/uu/sum/src/sum.rs +++ b/src/uu/sum/src/sum.rs @@ -140,7 +140,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(USAGE) diff --git a/src/uu/sync/src/sync.rs b/src/uu/sync/src/sync.rs index 7dd37d780..f49f51728 100644 --- a/src/uu/sync/src/sync.rs +++ b/src/uu/sync/src/sync.rs @@ -160,7 +160,7 @@ mod platform { } fn usage() -> String { - format!("{0} [OPTION]... FILE...", execution_phrase!()) + format!("{0} [OPTION]... FILE...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -193,7 +193,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/tac/src/tac.rs b/src/uu/tac/src/tac.rs index 70fa04622..67b361a76 100644 --- a/src/uu/tac/src/tac.rs +++ b/src/uu/tac/src/tac.rs @@ -51,7 +51,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(USAGE) diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs index 106c1c5db..44f910ea0 100644 --- a/src/uu/tail/src/tail.rs +++ b/src/uu/tail/src/tail.rs @@ -213,7 +213,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about("output the last part of files") // TODO: add usage diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs index 461600003..d98835265 100644 --- a/src/uu/tee/src/tee.rs +++ b/src/uu/tee/src/tee.rs @@ -33,7 +33,7 @@ struct Options { } fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -57,7 +57,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .after_help("If a FILE is -, it refers to a file named - .") diff --git a/src/uu/test/src/test.rs b/src/uu/test/src/test.rs index 939e13ab9..6eea00080 100644 --- a/src/uu/test/src/test.rs +++ b/src/uu/test/src/test.rs @@ -14,7 +14,6 @@ use clap::{crate_version, App, AppSettings}; use parser::{parse, Symbol}; use std::ffi::{OsStr, OsString}; use std::path::Path; -use uucore::util_name; const USAGE: &str = "test EXPRESSION or: test @@ -87,7 +86,7 @@ the version described here. Please refer to your shell's documentation for details about the options it supports."; pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .setting(AppSettings::DisableHelpFlags) .setting(AppSettings::DisableVersion) } diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs index 8b169b5b5..89fde82ca 100644 --- a/src/uu/timeout/src/timeout.rs +++ b/src/uu/timeout/src/timeout.rs @@ -23,7 +23,10 @@ use uucore::InvalidEncodingHandling; static ABOUT: &str = "Start COMMAND, and kill it if still running after DURATION."; fn usage() -> String { - format!("{0} [OPTION] DURATION COMMAND...", execution_phrase!()) + format!( + "{0} [OPTION] DURATION COMMAND...", + uucore::execution_phrase() + ) } const ERR_EXIT_STATUS: i32 = 125; diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs index 8ddfcfa74..7c0903665 100644 --- a/src/uu/touch/src/touch.rs +++ b/src/uu/touch/src/touch.rs @@ -48,7 +48,7 @@ fn local_tm_to_filetime(tm: time::Tm) -> FileTime { } fn usage() -> String { - format!("{0} [OPTION]... [USER]", execution_phrase!()) + format!("{0} [OPTION]... [USER]", uucore::execution_phrase()) } #[uucore_procs::gen_uumain] @@ -129,7 +129,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs index 7b6fbd6f2..d46318e38 100644 --- a/src/uu/tr/src/tr.rs +++ b/src/uu/tr/src/tr.rs @@ -229,7 +229,7 @@ fn translate_input( } fn usage() -> String { - format!("{} [OPTION]... SET1 [SET2]", execution_phrase!()) + format!("{} [OPTION]... SET1 [SET2]", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -264,7 +264,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { if sets.is_empty() { show_error!( "missing operand\nTry '{} --help' for more information.", - execution_phrase!() + uucore::execution_phrase() ); return 1; } @@ -273,7 +273,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { show_error!( "missing operand after '{}'\nTry '{} --help' for more information.", sets[0], - execution_phrase!() + uucore::execution_phrase() ); return 1; } @@ -312,7 +312,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/true/src/true.rs b/src/uu/true/src/true.rs index 07e075175..6b4a87bf1 100644 --- a/src/uu/true/src/true.rs +++ b/src/uu/true/src/true.rs @@ -10,7 +10,6 @@ extern crate uucore; use clap::App; use uucore::error::UResult; -use uucore::util_name; #[uucore_procs::gen_uumain] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -19,5 +18,5 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) } diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs index fdcff3fd5..062ef3811 100644 --- a/src/uu/truncate/src/truncate.rs +++ b/src/uu/truncate/src/truncate.rs @@ -64,7 +64,7 @@ pub mod options { } fn usage() -> String { - format!("{0} [OPTION]... [FILE]...", execution_phrase!()) + format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -133,7 +133,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs index c2416afb4..c0ef66598 100644 --- a/src/uu/tsort/src/tsort.rs +++ b/src/uu/tsort/src/tsort.rs @@ -90,7 +90,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .usage(USAGE) .about(SUMMARY) diff --git a/src/uu/tty/src/tty.rs b/src/uu/tty/src/tty.rs index 284916050..94e2e6b24 100644 --- a/src/uu/tty/src/tty.rs +++ b/src/uu/tty/src/tty.rs @@ -9,9 +9,6 @@ // spell-checker:ignore (ToDO) ttyname filedesc -#[macro_use] -extern crate uucore; - use clap::{crate_version, App, Arg}; use std::ffi::CStr; use std::io::Write; @@ -24,7 +21,7 @@ mod options { } fn usage() -> String { - format!("{0} [OPTION]...", execution_phrase!()) + format!("{0} [OPTION]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -78,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs index b15d950bf..5f8dfd8a8 100644 --- a/src/uu/uname/src/uname.rs +++ b/src/uu/uname/src/uname.rs @@ -50,7 +50,7 @@ const HOST_OS: &str = "Fuchsia"; const HOST_OS: &str = "Redox"; pub fn uumain(args: impl uucore::Args) -> i32 { - let usage = format!("{} [OPTION]...", execution_phrase!()); + let usage = format!("{} [OPTION]...", uucore::execution_phrase()); let matches = uu_app().usage(&usage[..]).get_matches_from(args); let uname = return_if_err!(1, PlatformInfo::new()); @@ -119,7 +119,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg(Arg::with_name(options::ALL) diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs index 4a4c50feb..cb8541048 100644 --- a/src/uu/unexpand/src/unexpand.rs +++ b/src/uu/unexpand/src/unexpand.rs @@ -102,7 +102,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .name(NAME) .version(crate_version!()) .usage(USAGE) diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs index 10cb7a4ce..5c3fa3b1e 100644 --- a/src/uu/uniq/src/uniq.rs +++ b/src/uu/uniq/src/uniq.rs @@ -222,7 +222,10 @@ fn opt_parsed(opt_name: &str, matches: &ArgMatches) -> Option { } fn usage() -> String { - format!("{0} [OPTION]... [INPUT [OUTPUT]]...", execution_phrase!()) + format!( + "{0} [OPTION]... [INPUT [OUTPUT]]...", + uucore::execution_phrase() + ) } fn get_long_usage() -> String { @@ -281,7 +284,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/unlink/src/unlink.rs b/src/uu/unlink/src/unlink.rs index e0a743c1c..c7fc00639 100644 --- a/src/uu/unlink/src/unlink.rs +++ b/src/uu/unlink/src/unlink.rs @@ -23,7 +23,7 @@ static ABOUT: &str = "Unlink the file at [FILE]."; static OPT_PATH: &str = "FILE"; fn usage() -> String { - format!("{} [OPTION]... FILE", execution_phrase!()) + format!("{} [OPTION]... FILE", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -44,13 +44,13 @@ pub fn uumain(args: impl uucore::Args) -> i32 { crash!( 1, "missing operand\nTry '{0} --help' for more information.", - execution_phrase!() + uucore::execution_phrase() ); } else if paths.len() > 1 { crash!( 1, "extra operand: '{1}'\nTry '{0} --help' for more information.", - execution_phrase!(), + uucore::execution_phrase(), paths[1] ); } @@ -95,7 +95,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg(Arg::with_name(OPT_PATH).hidden(true).multiple(true)) diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs index b19566ec3..e58f398db 100644 --- a/src/uu/uptime/src/uptime.rs +++ b/src/uu/uptime/src/uptime.rs @@ -33,7 +33,7 @@ extern "C" { } fn usage() -> String { - format!("{0} [OPTION]...", execution_phrase!()) + format!("{0} [OPTION]...", uucore::execution_phrase()) } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -64,7 +64,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/users/src/users.rs b/src/uu/users/src/users.rs index 7aed00507..866093189 100644 --- a/src/uu/users/src/users.rs +++ b/src/uu/users/src/users.rs @@ -8,9 +8,6 @@ // spell-checker:ignore (paths) wtmp -#[macro_use] -extern crate uucore; - use clap::{crate_version, App, Arg}; use uucore::utmpx::{self, Utmpx}; @@ -19,7 +16,7 @@ static ABOUT: &str = "Print the user names of users currently logged in to the c static ARG_FILES: &str = "files"; fn usage() -> String { - format!("{0} [FILE]", execution_phrase!()) + format!("{0} [FILE]", uucore::execution_phrase()) } fn get_long_usage() -> String { @@ -65,7 +62,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg(Arg::with_name(ARG_FILES).takes_value(true).max_values(1)) diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index 3077d31d9..ff586a6f6 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -99,7 +99,7 @@ fn usage() -> String { format!( "{0} [OPTION]... [FILE]... With no FILE, or when FILE is -, read standard input.", - execution_phrase!() + uucore::execution_phrase() ) } @@ -164,7 +164,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs index 59e8b7c36..b0ef7b3fa 100644 --- a/src/uu/who/src/who.rs +++ b/src/uu/who/src/who.rs @@ -45,7 +45,10 @@ static RUNLEVEL_HELP: &str = "print current runlevel"; static RUNLEVEL_HELP: &str = "print current runlevel (This is meaningless on non Linux)"; fn usage() -> String { - format!("{0} [OPTION]... [ FILE | ARG1 ARG2 ]", execution_phrase!()) + format!( + "{0} [OPTION]... [ FILE | ARG1 ARG2 ]", + uucore::execution_phrase() + ) } fn get_long_usage() -> String { @@ -160,7 +163,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { } pub fn uu_app() -> App<'static, 'static> { - App::new(util_name!()) + App::new(uucore::util_name()) .version(crate_version!()) .about(ABOUT) .arg( diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs index 8920b226d..6acd4e017 100644 --- a/src/uucore/src/lib/lib.rs +++ b/src/uucore/src/lib/lib.rs @@ -87,6 +87,38 @@ pub fn set_utility_is_second_arg() { crate::macros::UTILITY_IS_SECOND_ARG.store(true, Ordering::SeqCst) } +/// Get the executable path (as `OsString`). +fn executable_os() -> OsString { + args_os().next().unwrap() +} + +/// Get the executable path (as `String`). +fn executable() -> String { + executable_os().to_string_lossy().into_owned() +} + +/// Derive the utility name. +pub fn util_name() -> String { + if get_utility_is_second_arg() { + args_os().nth(1).unwrap().to_string_lossy().into_owned() + } else { + executable() + } +} + +/// Derive the complete execution phrase for "usage". +pub fn execution_phrase() -> String { + if get_utility_is_second_arg() { + args_os() + .take(2) + .map(|os_str| os_str.to_string_lossy().into_owned()) + .collect::>() + .join(" ") + } else { + executable() + } +} + pub enum InvalidEncodingHandling { Ignore, ConvertLossy, diff --git a/src/uucore/src/lib/macros.rs b/src/uucore/src/lib/macros.rs index c9fff455a..d16f04504 100644 --- a/src/uucore/src/lib/macros.rs +++ b/src/uucore/src/lib/macros.rs @@ -10,67 +10,14 @@ use std::sync::atomic::AtomicBool; /// Whether we were called as a multicall binary ("coreutils ") pub static UTILITY_IS_SECOND_ARG: AtomicBool = AtomicBool::new(false); -/// Get the executable path (as `OsString`). -#[macro_export] -macro_rules! executable_os( - () => ({ - $crate::args_os().next().unwrap() - }) -); - -/// Get the executable path (as `String`). -#[macro_export] -#[deprecated = "Use util_name!() or execution_phrase!() instead"] -macro_rules! executable( - () => ({ - $crate::executable_os!().to_string_lossy().to_string() - }) -); - -/// Derive the utility name. -#[macro_export] -macro_rules! util_name( - () => ({ - if $crate::get_utility_is_second_arg() { - $crate::args_os().nth(1).unwrap().to_string_lossy().to_string() - } else { - #[allow(deprecated)] - { - $crate::executable!() - } - } - }) -); - -//==== - -/// Derive the complete execution phrase for "usage". -#[macro_export] -macro_rules! execution_phrase( - () => ({ - if $crate::get_utility_is_second_arg() { - $crate::args_os() - .take(2) - .map(|os_str| os_str.to_string_lossy().to_string()) - .collect::>() - .join(" ") - } else { - #[allow(deprecated)] - { - $crate::executable!() - } - } - }) -); - //==== #[macro_export] macro_rules! show( ($err:expr) => ({ let e = $err; - uucore::error::set_exit_code(e.code()); - eprintln!("{}: {}", $crate::util_name!(), e); + $crate::error::set_exit_code(e.code()); + eprintln!("{}: {}", $crate::util_name(), e); }) ); @@ -87,7 +34,7 @@ macro_rules! show_if_err( #[macro_export] macro_rules! show_error( ($($args:tt)+) => ({ - eprint!("{}: ", $crate::util_name!()); + eprint!("{}: ", $crate::util_name()); eprintln!($($args)+); }) ); @@ -96,7 +43,7 @@ macro_rules! show_error( #[macro_export] macro_rules! show_error_custom_description ( ($err:expr,$($args:tt)+) => ({ - eprint!("{}: {}: ", $crate::util_name!(), $err); + eprint!("{}: {}: ", $crate::util_name(), $err); eprintln!($($args)+); }) ); @@ -104,7 +51,7 @@ macro_rules! show_error_custom_description ( #[macro_export] macro_rules! show_warning( ($($args:tt)+) => ({ - eprint!("{}: warning: ", $crate::util_name!()); + eprint!("{}: warning: ", $crate::util_name()); eprintln!($($args)+); }) ); @@ -113,9 +60,9 @@ macro_rules! show_warning( #[macro_export] macro_rules! show_usage_error( ($($args:tt)+) => ({ - eprint!("{}: ", $crate::util_name!()); + eprint!("{}: ", $crate::util_name()); eprintln!($($args)+); - eprintln!("Try '{} --help' for more information.", $crate::execution_phrase!()); + eprintln!("Try '{} --help' for more information.", $crate::execution_phrase()); }) ); diff --git a/src/uucore/src/lib/mods/coreopts.rs b/src/uucore/src/lib/mods/coreopts.rs index b81ef7e5a..b534ff902 100644 --- a/src/uucore/src/lib/mods/coreopts.rs +++ b/src/uucore/src/lib/mods/coreopts.rs @@ -120,7 +120,7 @@ impl<'a> CoreOptions<'a> { macro_rules! app { ($syntax: expr, $summary: expr, $long_help: expr) => { uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText { - name: util_name!(), + name: uucore::util_name(), version: env!("CARGO_PKG_VERSION"), syntax: $syntax, summary: $summary, @@ -130,7 +130,7 @@ macro_rules! app { }; ($syntax: expr, $summary: expr, $long_help: expr, $display_usage: expr) => { uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText { - name: util_name!(), + name: uucore::util_name(), version: env!("CARGO_PKG_VERSION"), syntax: $syntax, summary: $summary, diff --git a/src/uucore_procs/src/lib.rs b/src/uucore_procs/src/lib.rs index 7f7460283..092a4a66c 100644 --- a/src/uucore_procs/src/lib.rs +++ b/src/uucore_procs/src/lib.rs @@ -104,7 +104,7 @@ pub fn gen_uumain(_args: TokenStream, stream: TokenStream) -> TokenStream { show_error!("{}", s); } if e.usage() { - eprintln!("Try '{} --help' for more information.", execution_phrase!()); + eprintln!("Try '{} --help' for more information.", uucore::execution_phrase()); } e.code() }