mirror of
https://github.com/uutils/coreutils.git
synced 2026-06-10 15:48:22 -07:00
refactor/uucore ~ replace executable_name!() with util_name!() in standard messaging
This commit is contained in:
committed by
Michael Debertol
parent
23b68d80ba
commit
eb13533e4e
@@ -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!());
|
||||
})
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user