Make JSON and YAML formats optional

Author: Shatur

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 - Make binary dependencies optional
+- Make JSON and YAML formats optional
+- Bump MSRV to 1.60
 
 ## [v0.24.0] - 2022-05-12
 

Cargo.toml

@@ -37,8 +37,10 @@ path = "src/main.rs"
 required-features = ["bin"]
 
 [features]
-default = ["bin"]
+default = ["bin", "json", "yaml"]
 bin = ["dep:clap", "dep:clap_conf", "dep:env_logger"]
+json = ["dep:serde_json"]
+yaml = ["dep:serde_yaml"]
 
 [dependencies]
 cast = "0.3"
@@ -51,8 +53,8 @@ quote = "1.0"
 proc-macro2 = "1.0"
 anyhow = "1.0"
 thiserror = "1.0"
-serde_json = "1.0.79"
-serde_yaml = "0.8.23"
+serde_json = { version = "1.0.79", optional = true }
+serde_yaml = { version = "0.8.23", optional = true }
 
 [dependencies.svd-parser]
 features = ["expand"]

src/lib.rs

@@ -582,8 +582,10 @@ pub fn load_from(input: &str, config: &crate::util::Config) -> Result<svd::Devic
             svd_parser::parse_with_config(input, &parser_config)
                 .with_context(|| "Error parsing SVD XML file".to_string())?
         }
+        #[cfg(feature = "yaml")]
         SourceType::Yaml => serde_yaml::from_str(input)
             .with_context(|| "Error parsing SVD YAML file".to_string())?,
+        #[cfg(feature = "json")]
         SourceType::Json => serde_json::from_str(input)
             .with_context(|| "Error parsing SVD JSON file".to_string())?,
     };

src/util.rs

@@ -88,7 +88,9 @@ impl Default for Target {
 #[derive(Clone, Copy, PartialEq, Debug)]
 pub enum SourceType {
     Xml,
+    #[cfg(feature = "yaml")]
     Yaml,
+    #[cfg(feature = "json")]
     Json,
 }
 
@@ -102,9 +104,11 @@ impl SourceType {
     /// Make a new [`Source`] from a given extension.
     pub fn from_extension(s: &str) -> Option<Self> {
         match s {
+            "svd" | "xml" => Some(Self::Xml),
+            #[cfg(feature = "yaml")]
             "yml" | "yaml" => Some(Self::Yaml),
+            #[cfg(feature = "json")]
             "json" => Some(Self::Json),
-            "svd" | "xml" => Some(Self::Xml),
             _ => None,
         }
     }