Merge pull request #238 from rust-embedded/yaml-rust2

yaml_rust -> yaml_rust2

Author: burrbull

CHANGELOG-rust.md

@@ -5,6 +5,7 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+* Replace `yaml-rust` with `yaml-rust2`. Check for duplicate keys and other YAML parse errors
 * Prevent collapsing columns in HTML `register-map-table` with `min-width`
 * Protect from using one `enumeratedValues` in fields with different width
 

Cargo.toml

@@ -3,24 +3,25 @@ name = "svdtools"
 version = "0.3.17"
 repository = "https://github.com/rust-embedded/svdtools/"
 description = "Tool for modifying bugs in CMSIS SVD"
-authors = [
-    "Andrey Zgarbul <zgarbul.andrey@gmail.com>",
-    "MarcoIeni"
-]
+authors = ["Andrey Zgarbul <zgarbul.andrey@gmail.com>", "MarcoIeni"]
 categories = [
     "command-line-utilities",
     "embedded",
     "hardware-support",
     "no-std",
 ]
-keywords = [
-    "svd",
-    "embedded",
-    "register",
-]
+keywords = ["svd", "embedded", "register"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-include = ["/res", "/src", "/tests", "CHANGELOG-rust.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
+include = [
+    "/res",
+    "/src",
+    "/tests",
+    "CHANGELOG-rust.md",
+    "README.md",
+    "LICENSE-APACHE",
+    "LICENSE-MIT",
+]
 edition = "2021"
 rust-version = "1.70"
 
@@ -31,13 +32,12 @@ quick-xml = { version = "0.31", features = ["serialize"] }
 svd-rs = { version = "0.14.8", features = ["serde", "derive-from"] }
 svd-parser = { version = "0.14.5", features = ["expand"] }
 svd-encoder = "0.14.4"
-yaml-rust = "0.4"
 # serde_yaml 0.9.x looks broken
 serde_yaml = "0.8.26"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 anyhow = "1.0.65"
 thiserror = "1.0.35"
-linked-hash-map = "0.5"
+hashlink = "0.8.4"
 globset = "0.4.14"
 commands = "0.0.5"
 env_logger = "0.11"
@@ -50,6 +50,10 @@ regex = "1.10"
 itertools = "0.12.0"
 phf = { version = "0.11", features = ["macros"] }
 
+[dependencies.yaml-rust]
+package = "yaml-rust2"
+version = "0.8"
+
 [dev-dependencies]
 similar = "2.5.0"
 tempfile = "3.3"

src/patch/mod.rs

@@ -17,6 +17,8 @@ use svd_parser::SVDError::DimIndexParse;
 use svd_rs::{BitRange, DimArrayIndex, DimElement, DimElementBuilder, MaybeArray};
 use yaml_rust::{yaml::Hash, Yaml, YamlLoader};
 
+use hashlink::linked_hash_map;
+
 use anyhow::{anyhow, Context, Result};
 pub type PatchResult = anyhow::Result<()>;
 

src/patch/peripheral.rs

@@ -1314,7 +1314,7 @@ fn collect_in_cluster(
     cmod: &Hash,
     config: &Config,
 ) -> PatchResult {
-    let mut rdict = linked_hash_map::LinkedHashMap::new();
+    let mut rdict = super::linked_hash_map::LinkedHashMap::new();
     let mut first = None;
     let mut dim = 0;
     let mut dim_index = Vec::new();

src/patch/yaml_ext.rs

@@ -146,7 +146,7 @@ impl<'a> Iterator for OverStringIter<'a> {
     }
 }
 
-type HashIter<'a> = OptIter<linked_hash_map::Iter<'a, Yaml, Yaml>>;
+type HashIter<'a> = OptIter<super::linked_hash_map::Iter<'a, Yaml, Yaml>>;
 
 pub trait GetVal {
     fn get_yaml(&self, k: &str) -> Option<&Yaml>;