Merge pull request #245 from rust-embedded/strict-default

move EnumeratedValue check to strict mode

Author: Emilgardis

svd-rs/CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 - `default_value` for `EnumeratedValues`
+- move `EnumeratedValue` check to `strict` mode and fix it
 
 ## [v0.14.4] - 2023-11-15
 

svd-rs/src/enumeratedvalue.rs

@@ -34,8 +34,11 @@ pub struct EnumeratedValue {
 #[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
 pub enum Error {
     /// No value was specified
-    #[error("EnumeratedValue must contain one of `value` (passed {0:?}) or `is_default` (passed {1:?}) tags")]
-    AbsentValue(Option<u64>, Option<bool>),
+    #[error("EnumeratedValue has no `value` or `is_default`")]
+    AbsentValue,
+    /// Passed both value and isDefault, only checked in strict mode
+    #[error("EnumeratedValue with `value` (passed {0:?}) should not have `is_default(True)`")]
+    ValueAndDefault(Option<u64>),
     /// The value is not in range.
     #[error("Value {0} out of range {1:?}")]
     OutOfRange(u64, core::ops::Range<u64>),
@@ -101,6 +104,10 @@ impl EnumeratedValueBuilder {
 }
 
 impl EnumeratedValue {
+    /// Enumerated value is defaulted for non-explicit values
+    pub fn is_default(&self) -> bool {
+        matches!(self.is_default, Some(true))
+    }
     /// Make a builder for [`EnumeratedValue`]
     pub fn builder() -> EnumeratedValueBuilder {
         EnumeratedValueBuilder::default()
@@ -134,9 +141,10 @@ impl EnumeratedValue {
         if lvl.is_strict() {
             super::check_name(&self.name, "name")?;
         }
-        match (&self.value, &self.is_default) {
-            (Some(_), None) | (None, Some(_)) => Ok(()),
-            _ => Err(Error::AbsentValue(self.value, self.is_default).into()),
+        match (self.value.is_some(), self.is_default()) {
+            (false, false) => Err(Error::AbsentValue.into()),
+            (true, true) if lvl.is_strict() => Err(Error::ValueAndDefault(self.value).into()),
+            _ => Ok(()),
         }
     }
     pub(crate) fn check_range(&self, range: &core::ops::Range<u64>) -> Result<(), SvdError> {

svd-rs/src/enumeratedvalues.rs

@@ -103,7 +103,7 @@ impl EnumeratedValues {
     /// Return default value if present
     pub fn default_value(&self) -> Option<&EnumeratedValue> {
         for v in &self.values {
-            if let Some(true) = v.is_default {
+            if v.is_default() {
                 return Some(v);
             }
         }