Merge pull request #221 from rust-embedded/allow-underscore

allow underscore in spec

Author: burrbull

CHANGELOG-rust.md

@@ -6,6 +6,7 @@ This changelog tracks the Rust `svdtools` project. See
 ## [Unreleased]
 
 * Interpolate path and name in `description` and `derivedFrom`
+* Allow specs started with `_` (missing part)
 
 ## [v0.3.12] 2024-03-23
 
@@ -15,6 +16,7 @@ This changelog tracks the Rust `svdtools` project. See
 * Refactor `RegisterBlockExt`, use `BlockPath` for better errors
 * Allow specs started with `_`
 * Allow process, `_delete` and `_modify` cluster without `_clusters` specifier
+* Allow 1 string `_include`
 
 ## [v0.3.11] 2024-03-06
 

src/patch/mod.rs

@@ -162,9 +162,12 @@ pub fn yaml_includes(parent: &mut Hash) -> Result<Vec<PathBuf>> {
         }
     }
 
-    let inc = parent.get_vec("_include")?.unwrap_or(&Vec::new()).clone();
+    let inc = parent
+        .str_vec_iter("_include")?
+        .map(|s| s.to_string())
+        .collect::<Vec<_>>();
     for relpath in inc {
-        let relpath = relpath.as_str().unwrap();
+        let relpath = relpath.as_str();
         let path = abspath(&self_path, Path::new(relpath))
             .with_context(|| anyhow!("Opening file \"{relpath}\" from file {self_path:?}"))?;
         if included.contains(&path) {
@@ -259,9 +262,6 @@ fn newglob(spec: &str) -> globset::GlobMatcher {
 
 /// If a name matches a specification, return the first sub-specification that it matches
 fn matchsubspec<'a>(name: &str, spec: &'a str) -> Option<&'a str> {
-    if spec.starts_with('_') {
-        return None;
-    }
     if spec.contains('{') {
         let glob = newglob(spec);
         if glob.is_match(name) {
@@ -731,9 +731,7 @@ fn spec_ind(spec: &str) -> Option<(usize, usize)> {
         Regex::new(r"^[\w%]*((?:[\?*]|\[\d+(?:-\d+)?\]|\[[a-zA-Z]+(?:-[a-zA-Z]+)?\])+)[\w%]*$")
             .unwrap()
     });
-    let Some(caps) = RE.captures(spec) else {
-        return None;
-    };
+    let caps = RE.captures(spec)?;
     let spec = caps.get(0).unwrap();
     let token = caps.get(1).unwrap();
     let li = token.start();