github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 12:05:46 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

oof: add error variant DuplicatedFlag

Browse Source
This commit is contained in:
Vinícius Miguel 2021-04-07 23:36:58 -03:00
parent faae7c088f
commit 613074dff1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oof/src/error.rs
View File

@ -14,7 +14,8 @@ pub enum OofError<'t> {
/// User supplied an unrecognized short flag /// User supplied an unrecognized short flag
UnknownShortFlag(char), UnknownShortFlag(char),
MisplacedShortArgFlagError(char), MisplacedShortArgFlagError(char),
MissingValueToFlag(&'t Flag) MissingValueToFlag(&'t Flag),
DuplicatedFlag(&'t Flag)
} }
impl<'t> error::Error for OofError<'t> { impl<'t> error::Error for OofError<'t> {
@ -39,7 +40,8 @@ impl<'t> fmt::Display for OofError<'t> {
OofError::InvalidUnicode(flag) => write!(f, "{:?} is not valid Unicode.", flag), OofError::InvalidUnicode(flag) => write!(f, "{:?} is not valid Unicode.", flag),
OofError::UnknownShortFlag(ch) => write!(f, "Unknown argument '-{}'", ch), OofError::UnknownShortFlag(ch) => write!(f, "Unknown argument '-{}'", ch),
OofError::MisplacedShortArgFlagError(ch) => write!(f, "Invalid placement of `-{}`.\nOnly the last letter in a sequence of short flags can take values.", ch), OofError::MisplacedShortArgFlagError(ch) => write!(f, "Invalid placement of `-{}`.\nOnly the last letter in a sequence of short flags can take values.", ch),
OofError::MissingValueToFlag(flag) => write!(f, "Flag {} takes value but none was supplied.", flag) OofError::MissingValueToFlag(flag) => write!(f, "Flag {} takes value but none was supplied.", flag),
OofError::DuplicatedFlag(flag) => write!(f, "Duplicated usage of {}.", flag),
} }
} }
} }

8
oof/src/lib.rs
View File

@ -143,7 +143,7 @@ pub fn filter_flags(
if flag_info.takes_value { if flag_info.takes_value {
// If it was already inserted // If it was already inserted
if result_flags.argument_flags.contains_key(flag_name) { if result_flags.argument_flags.contains_key(flag_name) {
panic!("User error: duplicated, found this flag TWICE!"); return Err(OofError::DuplicatedFlag(flag_info));
} }
// pop the next one // pop the next one
@ -156,7 +156,7 @@ pub fn filter_flags(
} else { } else {
// If it was already inserted // If it was already inserted
if result_flags.boolean_flags.contains(flag_name) { if result_flags.boolean_flags.contains(flag_name) {
panic!("User error: duplicated, found this flag TWICE!"); return Err(OofError::DuplicatedFlag(flag_info));
} }
// Otherwise, insert it // Otherwise, insert it
result_flags.boolean_flags.insert(flag_name); result_flags.boolean_flags.insert(flag_name);
@ -176,7 +176,7 @@ pub fn filter_flags(
if flag_info.takes_value { if flag_info.takes_value {
// If it was already inserted // If it was already inserted
if result_flags.argument_flags.contains_key(&flag_name) { if result_flags.argument_flags.contains_key(&flag_name) {
panic!("User error: duplicated, found this flag TWICE!"); return Err(OofError::DuplicatedFlag(flag_info));
} }
let flag_argument = iter.next().unwrap_or_else(|| { let flag_argument = iter.next().unwrap_or_else(|| {
@ -189,7 +189,7 @@ pub fn filter_flags(
} else { } else {
// If it was already inserted // If it was already inserted
if result_flags.boolean_flags.contains(&flag_name) { if result_flags.boolean_flags.contains(&flag_name) {
panic!("User error: duplicated, found this flag TWICE!"); return Err(OofError::DuplicatedFlag(flag_info));
} }
// Otherwise, insert it // Otherwise, insert it
result_flags.boolean_flags.insert(&flag_name); result_flags.boolean_flags.insert(&flag_name);