Merge pull request #781 from rust-embedded/validate

post-serde validation

CHANGELOG.md

@@ -7,12 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+- Add `svd::Device` validation after parsing by `serde`
+- Add `skip-crate-attributes` config flag
+- Better display parsing errors
+
 ## [v0.31.2] - 2023-11-29
 
-- Add `skip-crate-attributes` config flag
 - Add iterators for register/cluster/field arrays
 - Use parentheses instead of square brackets in docs for field arrays
-- Better display parsing errors
 
 ## [v0.31.1] - 2023-11-27
 

Cargo.toml

@@ -60,11 +60,11 @@ html-escape = "0.2"
 
 [dependencies.svd-parser]
 features = ["expand"]
-version = "0.14.3"
+version = "0.14.4"
 
 [dependencies.svd-rs]
 features = ["serde"]
-version = "0.14.5"
+version = "0.14.6"
 
 [dependencies.syn]
 version = "2.0"

src/lib.rs

@@ -620,24 +620,34 @@ pub fn load_from(input: &str, config: &Config) -> Result<svd::Device> {
     use config::SourceType;
     use svd_parser::ValidateLevel;
 
+    let validate_level = if config.strict {
+        ValidateLevel::Strict
+    } else {
+        ValidateLevel::Weak
+    };
+
     let mut device = match config.source_type {
         SourceType::Xml => {
             let mut parser_config = svd_parser::Config::default();
-            parser_config.validate_level = if config.strict {
-                ValidateLevel::Strict
-            } else {
-                ValidateLevel::Weak
-            };
+            parser_config.validate_level = validate_level;
 
             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())?,
+        SourceType::Yaml => {
+            let device: svd::Device = serde_yaml::from_str(input)
+                .with_context(|| "Error parsing SVD YAML file".to_string())?;
+            device.validate_all(validate_level)?;
+            device
+        }
         #[cfg(feature = "json")]
-        SourceType::Json => serde_json::from_str(input)
-            .with_context(|| "Error parsing SVD JSON file".to_string())?,
+        SourceType::Json => {
+            let device: svd::Device = serde_json::from_str(input)
+                .with_context(|| "Error parsing SVD JSON file".to_string())?;
+            device.validate_all(validate_level)?;
+            device
+        }
     };
     svd_parser::expand_properties(&mut device);
     Ok(device)