common: move InputFormat

Author: flaviojs

src/common/input_format.rs

@@ -0,0 +1,26 @@
+use anyhow::{anyhow, Result};
+use std::str::FromStr;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum InputFormat {
+    Xml,
+    #[cfg(feature = "yaml")]
+    Yaml,
+    #[cfg(feature = "json")]
+    Json,
+}
+
+impl FromStr for InputFormat {
+    type Err = anyhow::Error;
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "svd" | "SVD" | "xml" | "XML" => Ok(Self::Xml),
+            #[cfg(feature = "yaml")]
+            "yml" | "yaml" | "YAML" => Ok(Self::Yaml),
+            #[cfg(feature = "json")]
+            "json" | "JSON" => Ok(Self::Json),
+            _ => Err(anyhow!("Unknown input file format")),
+        }
+    }
+}

src/common/mod.rs

@@ -1,3 +1,4 @@
+pub mod input_format;
 pub mod str_utils;
 pub mod svd_reader;
 pub mod svd_utils;

src/convert/convert_cli.rs

@@ -4,33 +4,10 @@ use std::str::FromStr;
 use std::{fs::File, path::Path};
 use svd_rs::Device;
 
+pub use crate::common::input_format::InputFormat;
 use crate::get_encoder_config;
 pub use crate::ConfigFormat;
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[non_exhaustive]
-pub enum InputFormat {
-    Xml,
-    #[cfg(feature = "yaml")]
-    Yaml,
-    #[cfg(feature = "json")]
-    Json,
-}
-
-impl FromStr for InputFormat {
-    type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "svd" | "SVD" | "xml" | "XML" => Ok(Self::Xml),
-            #[cfg(feature = "yaml")]
-            "yml" | "yaml" | "YAML" => Ok(Self::Yaml),
-            #[cfg(feature = "json")]
-            "json" | "JSON" => Ok(Self::Json),
-            _ => Err(anyhow!("Unknown input file format")),
-        }
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[non_exhaustive]
 pub enum OutputFormat {

src/patch/mod.rs

@@ -36,7 +36,7 @@ mod register;
 mod yaml_ext;
 use yaml_ext::{AsType, GetVal, ToYaml};
 
-use crate::convert::convert_cli::InputFormat;
+use crate::common::input_format::InputFormat;
 use crate::get_encoder_config;
 
 const VAL_LVL: ValidateLevel = ValidateLevel::Weak;