Factor out Enum! and Command! macros in arg_util

For easier refactoring, we remove the internal enum_int! macro and
instead copy its code to the Enum! and Command! macros.

1 files changed, 28 insertions, 3 deletions

diff --git a/nitrocli/src/arg_util.rs b/nitrocli/src/arg_util.rs
index fe755f3..68bd23f 100644
--- a/nitrocli/src/arg_util.rs
+++ b/nitrocli/src/arg_util.rs
@@ -33,9 +33,34 @@ macro_rules! Command {
       )*
     }
 
-    enum_int! {$name, [
-      $( $var => $str, )*
-    ]}
+    impl ::std::convert::AsRef<str> for $name {
+      fn as_ref(&self) -> &'static str {
+        match *self {
+          $(
+            $name::$var => $str,
+          )*
+        }
+      }
+    }
+
+    impl ::std::fmt::Display for $name {
+      fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        write!(f, "{}", self.as_ref())
+      }
+    }
+
+    impl ::std::str::FromStr for $name {
+      type Err = &'static str;
+
+      fn from_str(s: &str) -> ::std::result::Result<Self, Self::Err> {
+        match s {
+          $(
+            $str => Ok($name::$var),
+          )*
+          _ => Err("[error]"),
+        }
+      }
+    }
 
     #[allow(unused_qualifications)]
     impl $name {