Merge #105

105: rayon r=therealprof a=burrbull

Slight speed-up with `rayon`

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

Author: bors[bot]

Cargo.toml

@@ -18,10 +18,10 @@ derive-from = []
 unproven = []
 
 [dependencies]
-either = "1.5"
 xmltree = "0.8"
 anyhow = "1.0.19"
 thiserror = "1.0.5"
+rayon = "1.3.0"
 
 [dependencies.serde]
 version = "1.0"

src/svd/bitrange.rs

@@ -92,21 +92,19 @@ impl Parse for BitRange {
         } else if let (Some(offset), Some(width)) =
             (tree.get_child("bitOffset"), tree.get_child("bitWidth"))
         {
-            (
-                // Special case because offset and width are directly provided
-                // (ie. do not need to be calculated as in the final step)
-                return Ok(BitRange {
-                    // TODO: capture that error comes from offset/width tag
-                    // TODO: `u32::parse` should not hide it's errors
-                    offset: u32::parse(offset).with_context(|| {
-                        SVDError::InvalidBitRange(tree.clone(), InvalidBitRange::ParseError)
-                    })?,
-                    width: u32::parse(width).with_context(|| {
-                        SVDError::InvalidBitRange(tree.clone(), InvalidBitRange::ParseError)
-                    })?,
-                    range_type: BitRangeType::OffsetWidth,
-                })
-            )
+            // Special case because offset and width are directly provided
+            // (ie. do not need to be calculated as in the final step)
+            return Ok(BitRange {
+                // TODO: capture that error comes from offset/width tag
+                // TODO: `u32::parse` should not hide it's errors
+                offset: u32::parse(offset).with_context(|| {
+                    SVDError::InvalidBitRange(tree.clone(), InvalidBitRange::ParseError)
+                })?,
+                width: u32::parse(width).with_context(|| {
+                    SVDError::InvalidBitRange(tree.clone(), InvalidBitRange::ParseError)
+                })?,
+                range_type: BitRangeType::OffsetWidth,
+            });
         } else {
             return Err(SVDError::InvalidBitRange(tree.clone(), InvalidBitRange::Syntax).into());
         };

src/svd/device.rs

@@ -3,6 +3,8 @@ use crate::elementext::ElementExt;
 use std::collections::HashMap;
 use xmltree::Element;
 
+use rayon::prelude::*;
+
 use crate::parse;
 use crate::types::Parse;
 
@@ -47,7 +49,7 @@ impl Parse for Device {
                 let ps: Result<Vec<_>, _> = tree
                     .get_child_elem("peripherals")?
                     .children
-                    .iter()
+                    .par_iter()
                     .map(Peripheral::parse)
                     .collect();
                 ps?