RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 21:47:46 +00:00
Code Issues Activity

fix/uucore ~ revise and fix msg macros and sub-macros

Browse source
This commit is contained in:
Roy Ivy III 2021-06-30 22:19:18 -05:00 • committed by Michael Debertol
parent 065330c4ca
commit ed240a7e50
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,25 +189,25 @@ macro_rules! safe_unwrap(
//-- message templates //-- message templates
//-- message templates : general //-- message templates : (join utility sub-macros)
#[macro_export] #[macro_export]
macro_rules! snippet_list_join_oxford { macro_rules! snippet_list_join_oxford_comma {
($conjunction:expr, $valOne:expr, $valTwo:expr) => ( ($conjunction:expr, $valOne:expr, $valTwo:expr) => (
format!("{}, {} {}", $valOne, $conjunction, $valTwo) format!("{}, {} {}", $valOne, $conjunction, $valTwo)
); );
($conjunction:expr, $valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => ( ($conjunction:expr, $valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => (
format!("{}, {}", $valOne, snippet_list_join_inner!($conjunction, $valTwo $(, $remaining_values)*)) format!("{}, {}", $valOne, snippet_list_join_oxford_comma!($conjunction, $valTwo $(, $remaining_values)*))
); );
} }
#[macro_export] #[macro_export]
macro_rules! snippet_list_join_or { macro_rules! snippet_list_join {
($valOne:expr, $valTwo:expr) => ( ($conjunction:expr, $valOne:expr, $valTwo:expr) => (
format!("{} or {}", $valOne, $valTwo) format!("{} {} {}", $valOne, $conjunction, $valTwo)
); );
($valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => ( ($conjunction:expr, $valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => (
format!("{}, {}", $valOne, snippet_list_join_oxford!("or", $valTwo $(, $remaining_values)*)) format!("{}, {}", $valOne, snippet_list_join_oxford_comma!($conjunction, $valTwo $(, $remaining_values)*))
); );
} }
@ -271,13 +271,13 @@ macro_rules! msg_opt_invalid_should_be {
#[macro_export] #[macro_export]
macro_rules! msg_expects_one_of { macro_rules! msg_expects_one_of {
($valOne:expr $(, $remaining_values:expr)*) => ( ($valOne:expr $(, $remaining_values:expr)*) => (
msg_invalid_input!(format!("expects one of {}", snippet_list_join_or!($valOne $(, $remaining_values)*))) msg_invalid_input!(format!("expects one of {}", snippet_list_join!("or", $valOne $(, $remaining_values)*)))
); );
} }
#[macro_export] #[macro_export]
macro_rules! msg_expects_no_more_than_one_of { macro_rules! msg_expects_no_more_than_one_of {
($valOne:expr $(, $remaining_values:expr)*) => ( ($valOne:expr $(, $remaining_values:expr)*) => (
msg_invalid_input!(format!("expects no more than one of {}", snippet_list_join_or!($valOne $(, $remaining_values)*))) ; msg_invalid_input!(format!("expects no more than one of {}", snippet_list_join!("or", $valOne $(, $remaining_values)*))) ;
); );
} }