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

Removing lifetime from OofError

Browse Source
This commit is contained in:
João M. Bezerra 2021-05-19 12:18:05 -03:00
parent dbb329344a
commit 5e7ee4f959
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oof/src/error.rs
View File

@ -3,7 +3,7 @@ use std::{error, ffi::OsString, fmt};
use crate::Flag; use crate::Flag;
#[derive(Debug)] #[derive(Debug)]
pub enum OofError<'t> { pub enum OofError {
FlagValueConflict { FlagValueConflict {
flag: Flag, flag: Flag,
previous_value: OsString, previous_value: OsString,
@ -15,17 +15,17 @@ pub enum OofError<'t> {
UnknownShortFlag(char), UnknownShortFlag(char),
UnknownLongFlag(String), UnknownLongFlag(String),
MisplacedShortArgFlagError(char), MisplacedShortArgFlagError(char),
MissingValueToFlag(&'t Flag), MissingValueToFlag(Flag),
DuplicatedFlag(&'t Flag), DuplicatedFlag(Flag),
} }
impl<'t> error::Error for OofError<'t> { impl error::Error for OofError {
fn source(&self) -> Option<&(dyn error::Error + 'static)> { fn source(&self) -> Option<&(dyn error::Error + 'static)> {
None None
} }
} }
impl<'t> fmt::Display for OofError<'t> { impl fmt::Display for OofError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// TODO: implement proper debug messages // TODO: implement proper debug messages
match self { match self {

20
oof/src/lib.rs
View File

@ -131,7 +131,7 @@ pub fn filter_flags(
let is_last_letter = i == letters.len() - 1; let is_last_letter = i == letters.len() - 1;
let flag_info = let flag_info =
short_flags_info.get(&letter).ok_or(OofError::UnknownShortFlag(letter))?; *short_flags_info.get(&letter).ok_or(OofError::UnknownShortFlag(letter))?;
if !is_last_letter && flag_info.takes_value { if !is_last_letter && flag_info.takes_value {
return Err(OofError::MisplacedShortArgFlagError(letter)); return Err(OofError::MisplacedShortArgFlagError(letter));
@ -145,19 +145,20 @@ 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) {
return Err(OofError::DuplicatedFlag(flag_info)); return Err(OofError::DuplicatedFlag(flag_info.clone()));
} }
// pop the next one // pop the next one
let flag_argument = let flag_argument = iter
iter.next().ok_or(OofError::MissingValueToFlag(flag_info))?; .next()
.ok_or_else(|| OofError::MissingValueToFlag(flag_info.clone()))?;
// Otherwise, insert it. // Otherwise, insert it.
result_flags.argument_flags.insert(flag_name, flag_argument); result_flags.argument_flags.insert(flag_name, flag_argument);
} 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) {
return Err(OofError::DuplicatedFlag(flag_info)); return Err(OofError::DuplicatedFlag(flag_info.clone()));
} }
// Otherwise, insert it // Otherwise, insert it
result_flags.boolean_flags.insert(flag_name); result_flags.boolean_flags.insert(flag_name);
@ -168,7 +169,7 @@ pub fn filter_flags(
if let FlagType::Long = flag_type { if let FlagType::Long = flag_type {
let flag = trim_double_hyphen(flag); let flag = trim_double_hyphen(flag);
let flag_info = long_flags_info let flag_info = *long_flags_info
.get(flag) .get(flag)
.ok_or_else(|| OofError::UnknownLongFlag(String::from(flag)))?; .ok_or_else(|| OofError::UnknownLongFlag(String::from(flag)))?;
@ -177,15 +178,16 @@ 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) {
return Err(OofError::DuplicatedFlag(flag_info)); return Err(OofError::DuplicatedFlag(flag_info.clone()));
} }
let flag_argument = iter.next().ok_or(OofError::MissingValueToFlag(flag_info))?; let flag_argument =
iter.next().ok_or_else(|| OofError::MissingValueToFlag(flag_info.clone()))?;
result_flags.argument_flags.insert(flag_name, flag_argument); result_flags.argument_flags.insert(flag_name, flag_argument);
} 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) {
return Err(OofError::DuplicatedFlag(flag_info)); return Err(OofError::DuplicatedFlag(flag_info.clone()));
} }
// Otherwise, insert it // Otherwise, insert it
result_flags.boolean_flags.insert(&flag_name); result_flags.boolean_flags.insert(&flag_name);