Merge #213

213: dimIndex serialize r=therealprof a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

svd-parser/src/dimelement.rs

@@ -1,4 +1,3 @@
-use super::types::DimIndex;
 use super::*;
 use crate::svd::{DimArrayIndex, DimElement, EnumeratedValue};
 
@@ -44,3 +43,16 @@ impl Parse for DimArrayIndex {
         })
     }
 }
+
+struct DimIndex;
+
+impl Parse for DimIndex {
+    type Object = Vec<String>;
+    type Error = SVDErrorAt;
+    type Config = Config;
+
+    fn parse(tree: &Node, _config: &Self::Config) -> Result<Vec<String>, Self::Error> {
+        DimElement::parse_indexes(tree.get_text()?)
+            .ok_or_else(|| SVDError::DimIndexParse.at(tree.id()))
+    }
+}

svd-parser/src/elementext.rs

@@ -34,12 +34,7 @@ impl<'a, 'input> ElementExt for Node<'a, 'input> {
     where
         K: AsRef<str>,
     {
-        for c in self.children() {
-            if c.has_tag_name(k.as_ref()) {
-                return Some(c);
-            }
-        }
-        None
+        self.children().find(|&c| c.has_tag_name(k.as_ref()))
     }
     fn get_child_text_opt<K>(&self, k: K) -> Result<Option<String>, SVDErrorAt>
     where

svd-parser/src/expand.rs

@@ -571,11 +571,11 @@ pub fn derive_enumerated_values(
             Ok(epath)
         }
     } else {
-        return Err(anyhow!(
+        Err(anyhow!(
             "enumeratedValues {} not found, parent field: {:?}",
             dpath,
             fpath,
-        ));
+        ))
     }
 }
 

svd-parser/src/lib.rs

@@ -220,7 +220,7 @@ pub mod expand;
 #[cfg(feature = "expand")]
 pub use expand::{expand, expand_properties};
 /// SVD parse Errors.
-#[derive(Clone, Debug, PartialEq, thiserror::Error)]
+#[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
 pub enum SVDError {
     #[error("{0}")]
     Svd(#[from] svd::SvdError),

svd-parser/src/types.rs

@@ -3,7 +3,7 @@
 
 use roxmltree::Node;
 
-use super::{Config, ElementExt, Parse, SVDError, SVDErrorAt};
+use super::{ElementExt, Parse, SVDError, SVDErrorAt};
 
 impl Parse for u32 {
     type Object = u32;
@@ -84,32 +84,3 @@ impl Parse for BoolParse {
         }
     }
 }
-
-pub struct DimIndex;
-
-impl Parse for DimIndex {
-    type Object = Vec<String>;
-    type Error = SVDErrorAt;
-    type Config = Config;
-
-    fn parse(tree: &Node, _config: &Self::Config) -> Result<Vec<String>, Self::Error> {
-        let text = tree.get_text()?;
-        if text.contains('-') {
-            let mut parts = text.splitn(2, '-');
-            let start = parts
-                .next()
-                .ok_or_else(|| SVDError::DimIndexParse.at(tree.id()))?
-                .parse::<u32>()
-                .map_err(|e| SVDError::from(e).at(tree.id()))?;
-            let end = parts
-                .next()
-                .ok_or_else(|| SVDError::DimIndexParse.at(tree.id()))?
-                .parse::<u32>()
-                .map_err(|e| SVDError::from(e).at(tree.id()))?;
-
-            Ok((start..=end).map(|i| i.to_string()).collect())
-        } else {
-            Ok(text.split(',').map(|s| s.to_string()).collect())
-        }
-    }
-}

svd-rs/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+- (De)serialize `dimIndex` (from)to string 
+
 ## [v0.14.0] - 2022-07-19
 
 - Bump MSRV to 1.56.0 (2021)

svd-rs/src/access.rs

@@ -1,7 +1,7 @@
 /// Defines access rights for fields on the device, though it may be specified at a
 /// higher level than individual fields.
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Access {
     /// Read access is permitted. Write operations have an undefined effect.
     #[cfg_attr(feature = "serde", serde(rename = "read-only"))]

svd-rs/src/addressblock.rs

@@ -2,7 +2,7 @@ use super::{BuildError, Protection, SvdError, ValidateLevel};
 
 ///  An uniquely mapped address block to a peripheral
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 #[non_exhaustive]
 pub struct AddressBlock {
     /// Specifies the start address of an address block relative to the peripheral [`baseAddress`](crate::Peripheral::base_address).
@@ -63,7 +63,7 @@ impl AddressBlockUsage {
 }
 
 /// Builder for [`AddressBlock`]
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct AddressBlockBuilder {
     offset: Option<u32>,
     size: Option<u32>,

svd-rs/src/array.rs

@@ -2,7 +2,7 @@ use super::{DimElement, Name};
 use core::ops::{Deref, DerefMut};
 
 /// A single SVD instance or array of instances
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum MaybeArray<T> {
     /// A single instance
     Single(T),

svd-rs/src/bitrange.rs

@@ -7,7 +7,7 @@ pub enum Error {
 }
 
 /// A bit range, describing the [least significant bit](Self::lsb) and [most significant bit](Self::msb)
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct BitRange {
     /// Value defining the position of the least significant bit of the field within the register
     pub offset: u32,
@@ -20,7 +20,7 @@ pub struct BitRange {
 }
 
 /// The style of bit range that describes a [BitRange]
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum BitRangeType {
     /// A bit range in the format: `[<msb>:<lsb>]`
     BitRange,