refactor env_var arg

src/cli/args/env_var.rs

@@ -1,41 +1,26 @@
-use std::ffi::OsStr;
-
-use clap::{Arg, Command, Error};
+use std::str::FromStr;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct EnvVarArg {
     pub key: String,
     pub value: Option<String>,
 }
 
-impl EnvVarArg {
-    pub fn parse(input: &str) -> Self {
-        input
-            .split_once('=')
-            .map(|(k, v)| Self {
+impl FromStr for EnvVarArg {
+    type Err = miette::Error;
+
+    fn from_str(input: &str) -> miette::Result<Self> {
+        let ev = match input.split_once('=') {
+            Some((k, v)) => Self {
                 key: k.to_string(),
                 value: Some(v.to_string()),
-            })
-            .unwrap_or_else(|| Self {
+            },
+            None => Self {
                 key: input.to_string(),
                 value: None,
-            })
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct EnvVarArgParser;
-
-impl clap::builder::TypedValueParser for EnvVarArgParser {
-    type Value = EnvVarArg;
-
-    fn parse_ref(
-        &self,
-        _cmd: &Command,
-        _arg: Option<&Arg>,
-        value: &OsStr,
-    ) -> Result<Self::Value, Error> {
-        Ok(EnvVarArg::parse(&value.to_string_lossy()))
+            },
+        };
+        Ok(ev)
     }
 }
 
@@ -52,7 +37,7 @@ mod tests {
         ];
 
         for (input, want) in values {
-            let got = EnvVarArg::parse(input);
+            let got: EnvVarArg = input.parse().unwrap();
             assert_eq!(got, want);
         }
     }

src/cli/set.rs

@@ -10,7 +10,7 @@ use crate::env;
 use crate::file::display_path;
 use crate::ui::table;
 
-use super::args::env_var::{EnvVarArg, EnvVarArgParser};
+use super::args::env_var::EnvVarArg;
 
 /// Manage environment variables
 ///
@@ -36,7 +36,7 @@ pub struct Set {
 
     /// Environment variable(s) to set
     /// e.g.: NODE_ENV=production
-    #[clap(value_parser = EnvVarArgParser, verbatim_doc_comment)]
+    #[clap(verbatim_doc_comment)]
     env_vars: Option<Vec<EnvVarArg>>,
 }