RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

refactor/uucore ~ replace executable_name!() with util_name!() in standard messaging

Browse source
This commit is contained in:
Roy Ivy III 2021-07-26 20:25:41 -05:00 • committed by Michael Debertol
parent 23b68d80ba
commit eb13533e4e
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/uucore/src/lib/macros.rs
View file

@ -55,7 +55,7 @@ macro_rules! show(
($err:expr) => ({ ($err:expr) => ({
let e = $err; let e = $err;
uucore::error::set_exit_code(e.code()); uucore::error::set_exit_code(e.code());
eprintln!("{}: {}", $crate::executable_name!(), e); eprintln!("{}: {}", $crate::util_name!(), e);
}) })
); );
@ -72,7 +72,7 @@ macro_rules! show_if_err(
#[macro_export] #[macro_export]
macro_rules! show_error( macro_rules! show_error(
($($args:tt)+) => ({ ($($args:tt)+) => ({
eprint!("{}: ", $crate::executable_name!()); eprint!("{}: ", $crate::util_name!());
eprintln!($($args)+); eprintln!($($args)+);
}) })
); );
@ -81,7 +81,7 @@ macro_rules! show_error(
#[macro_export] #[macro_export]
macro_rules! show_error_custom_description ( macro_rules! show_error_custom_description (
($err:expr,$($args:tt)+) => ({ ($err:expr,$($args:tt)+) => ({
eprint!("{}: {}: ", $crate::executable_name!(), $err); eprint!("{}: {}: ", $crate::util_name!(), $err);
eprintln!($($args)+); eprintln!($($args)+);
}) })
); );
@ -89,7 +89,7 @@ macro_rules! show_error_custom_description (
#[macro_export] #[macro_export]
macro_rules! show_warning( macro_rules! show_warning(
($($args:tt)+) => ({ ($($args:tt)+) => ({
eprint!("{}: warning: ", $crate::executable_name!()); eprint!("{}: warning: ", $crate::util_name!());
eprintln!($($args)+); eprintln!($($args)+);
}) })
); );
@ -98,7 +98,7 @@ macro_rules! show_warning(
#[macro_export] #[macro_export]
macro_rules! show_usage_error( macro_rules! show_usage_error(
($($args:tt)+) => ({ ($($args:tt)+) => ({
eprint!("{}: ", $crate::executable_name!()); eprint!("{}: ", $crate::util_name!());
eprintln!($($args)+); eprintln!($($args)+);
eprintln!("Try `{:?} --help` for more information.", $crate::executable!()); eprintln!("Try `{:?} --help` for more information.", $crate::executable!());
}) })

4
src/uucore/src/lib/mods/coreopts.rs
View file

@ -120,7 +120,7 @@ impl<'a> CoreOptions<'a> {
macro_rules! app { macro_rules! app {
($syntax: expr, $summary: expr, $long_help: expr) => { ($syntax: expr, $summary: expr, $long_help: expr) => {
uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText { uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText {
name: executable!(), name: util_name!(),
version: env!("CARGO_PKG_VERSION"), version: env!("CARGO_PKG_VERSION"),
syntax: $syntax, syntax: $syntax,
summary: $summary, summary: $summary,
@ -130,7 +130,7 @@ macro_rules! app {
}; };
($syntax: expr, $summary: expr, $long_help: expr, $display_usage: expr) => { ($syntax: expr, $summary: expr, $long_help: expr, $display_usage: expr) => {
uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText { uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText {
name: executable!(), name: util_name!(),
version: env!("CARGO_PKG_VERSION"), version: env!("CARGO_PKG_VERSION"),
syntax: $syntax, syntax: $syntax,
summary: $summary, summary: $summary,