Impl FromStr for DeprecationStrategy

Removes duplicated code.

Author: tomhoule

graphql_client_cli/src/generate.rs

@@ -1,9 +1,7 @@
 use failure;
-use graphql_client_codegen::{
-    deprecation, generate_module_token_stream, GraphQLClientCodegenOptions,
-};
+use graphql_client_codegen::{generate_module_token_stream, GraphQLClientCodegenOptions};
 use std::fs::File;
-use std::io::Write as IoWrite;
+use std::io::Write as _;
 use std::path::PathBuf;
 use syn;
 
@@ -19,12 +17,10 @@ pub(crate) struct CliCodegenParams {
 }
 
 pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Error> {
-    let deprecation_strategy = match params.deprecation_strategy.as_ref().map(|s| s.as_str()) {
-        Some("allow") => Some(deprecation::DeprecationStrategy::Allow),
-        Some("deny") => Some(deprecation::DeprecationStrategy::Deny),
-        Some("warn") => Some(deprecation::DeprecationStrategy::Warn),
-        _ => None,
-    };
+    let deprecation_strategy = params
+        .deprecation_strategy
+        .as_ref()
+        .and_then(|s| s.parse().ok());
 
     let mut options = GraphQLClientCodegenOptions::new_default();
 

graphql_client_codegen/src/deprecation.rs

@@ -23,3 +23,16 @@ impl Default for DeprecationStrategy {
         DeprecationStrategy::Warn
     }
 }
+
+impl std::str::FromStr for DeprecationStrategy {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, ()> {
+        match s.trim() {
+            "allow" => Ok(DeprecationStrategy::Allow),
+            "deny" => Ok(DeprecationStrategy::Deny),
+            "warn" => Ok(DeprecationStrategy::Warn),
+            _ => Err(()),
+        }
+    }
+}

graphql_query_derive/src/attributes.rs

@@ -40,12 +40,11 @@ pub fn extract_attr(ast: &syn::DeriveInput, attr: &str) -> Result<String, failur
 pub fn extract_deprecation_strategy(
     ast: &syn::DeriveInput,
 ) -> Result<DeprecationStrategy, failure::Error> {
-    match extract_attr(&ast, "deprecated")?.to_lowercase().as_str() {
-        "allow" => Ok(DeprecationStrategy::Allow),
-        "deny" => Ok(DeprecationStrategy::Deny),
-        "warn" => Ok(DeprecationStrategy::Warn),
-        _ => Err(format_err!("{}", DEPRECATION_ERROR))?,
-    }
+    extract_attr(&ast, "deprecated")?
+        .to_lowercase()
+        .as_str()
+        .parse()
+        .map_err(|_| format_err!("{}", DEPRECATION_ERROR))
 }
 
 #[cfg(test)]