diff --git a/src/uucore/src/lib/macros.rs b/src/uucore/src/lib/macros.rs index 715752c84..06aad6f36 100644 --- a/src/uucore/src/lib/macros.rs +++ b/src/uucore/src/lib/macros.rs @@ -55,7 +55,7 @@ macro_rules! show( ($err:expr) => ({ let e = $err; 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_rules! show_error( ($($args:tt)+) => ({ - eprint!("{}: ", $crate::executable_name!()); + eprint!("{}: ", $crate::util_name!()); eprintln!($($args)+); }) ); @@ -81,7 +81,7 @@ macro_rules! show_error( #[macro_export] macro_rules! show_error_custom_description ( ($err:expr,$($args:tt)+) => ({ - eprint!("{}: {}: ", $crate::executable_name!(), $err); + eprint!("{}: {}: ", $crate::util_name!(), $err); eprintln!($($args)+); }) ); @@ -89,7 +89,7 @@ macro_rules! show_error_custom_description ( #[macro_export] macro_rules! show_warning( ($($args:tt)+) => ({ - eprint!("{}: warning: ", $crate::executable_name!()); + eprint!("{}: warning: ", $crate::util_name!()); eprintln!($($args)+); }) ); @@ -98,7 +98,7 @@ macro_rules! show_warning( #[macro_export] macro_rules! show_usage_error( ($($args:tt)+) => ({ - eprint!("{}: ", $crate::executable_name!()); + eprint!("{}: ", $crate::util_name!()); eprintln!($($args)+); eprintln!("Try `{:?} --help` for more information.", $crate::executable!()); }) diff --git a/src/uucore/src/lib/mods/coreopts.rs b/src/uucore/src/lib/mods/coreopts.rs index f3fb77335..b81ef7e5a 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: executable!(), + name: 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: executable!(), + name: util_name!(), version: env!("CARGO_PKG_VERSION"), syntax: $syntax, summary: $summary,