From 5e7ee4f959691e20149ab7422cfcb5404ea4e632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20M=2E=20Bezerra?= <marcospb19@hotmail.com>
Date: Wed, 19 May 2021 12:18:05 -0300
Subject: [PATCH] Removing lifetime from OofError

---
 oof/src/error.rs | 10 +++++-----
 oof/src/lib.rs   | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/oof/src/error.rs b/oof/src/error.rs
index 306f176..3da0415 100644
--- a/oof/src/error.rs
+++ b/oof/src/error.rs
@@ -3,7 +3,7 @@ use std::{error, ffi::OsString, fmt};
 use crate::Flag;
 
 #[derive(Debug)]
-pub enum OofError<'t> {
+pub enum OofError {
     FlagValueConflict {
         flag: Flag,
         previous_value: OsString,
@@ -15,17 +15,17 @@ pub enum OofError<'t> {
     UnknownShortFlag(char),
     UnknownLongFlag(String),
     MisplacedShortArgFlagError(char),
-    MissingValueToFlag(&'t Flag),
-    DuplicatedFlag(&'t Flag),
+    MissingValueToFlag(Flag),
+    DuplicatedFlag(Flag),
 }
 
-impl<'t> error::Error for OofError<'t> {
+impl error::Error for OofError {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         None
     }
 }
 
-impl<'t> fmt::Display for OofError<'t> {
+impl fmt::Display for OofError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // TODO: implement proper debug messages
         match self {
diff --git a/oof/src/lib.rs b/oof/src/lib.rs
index 53aed70..c03fe5b 100644
--- a/oof/src/lib.rs
+++ b/oof/src/lib.rs
@@ -131,7 +131,7 @@ pub fn filter_flags(
                 let is_last_letter = i == letters.len() - 1;
 
                 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 {
                     return Err(OofError::MisplacedShortArgFlagError(letter));
@@ -145,19 +145,20 @@ pub fn filter_flags(
                 if flag_info.takes_value {
                     // If it was already inserted
                     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
-                    let flag_argument =
-                        iter.next().ok_or(OofError::MissingValueToFlag(flag_info))?;
+                    let flag_argument = iter
+                        .next()
+                        .ok_or_else(|| OofError::MissingValueToFlag(flag_info.clone()))?;
 
                     // Otherwise, insert it.
                     result_flags.argument_flags.insert(flag_name, flag_argument);
                 } else {
                     // If it was already inserted
                     if result_flags.boolean_flags.contains(flag_name) {
-                        return Err(OofError::DuplicatedFlag(flag_info));
+                        return Err(OofError::DuplicatedFlag(flag_info.clone()));
                     }
                     // Otherwise, insert it
                     result_flags.boolean_flags.insert(flag_name);
@@ -168,7 +169,7 @@ pub fn filter_flags(
         if let FlagType::Long = flag_type {
             let flag = trim_double_hyphen(flag);
 
-            let flag_info = long_flags_info
+            let flag_info = *long_flags_info
                 .get(flag)
                 .ok_or_else(|| OofError::UnknownLongFlag(String::from(flag)))?;
 
@@ -177,15 +178,16 @@ pub fn filter_flags(
             if flag_info.takes_value {
                 // If it was already inserted
                 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);
             } else {
                 // If it was already inserted
                 if result_flags.boolean_flags.contains(&flag_name) {
-                    return Err(OofError::DuplicatedFlag(flag_info));
+                    return Err(OofError::DuplicatedFlag(flag_info.clone()));
                 }
                 // Otherwise, insert it
                 result_flags.boolean_flags.insert(&flag_name);