Merge pull request #140 from stm32-rs/normpath

normpath

Author: burrbull

CHANGELOG-rust.md

@@ -6,6 +6,7 @@ This changelog tracks the Rust `svdtools` project. See
 ## [Unreleased]
 
 * cluster add/modify
+* use `normpath` instead of std::fs::canonicalize
 
 ## [v0.2.8] 2022-01-28
 

Cargo.toml

@@ -41,6 +41,7 @@ globset = "0.4.8"
 commands = "0.0.5"
 env_logger = "0.9"
 log = { version = "~0.4", features = ["std"] }
+normpath = "1.1.0"
 
 [dev-dependencies]
 tempfile = "3.3"

src/patch/mod.rs

@@ -15,7 +15,7 @@ use svd_parser::SVDError::DimIndexParse;
 use svd_rs::{DimElement, DimElementBuilder, MaybeArray};
 use yaml_rust::{yaml::Hash, Yaml, YamlLoader};
 
-use anyhow::{anyhow, Context, Ok, Result};
+use anyhow::{anyhow, Context, Result};
 pub type PatchResult = anyhow::Result<()>;
 
 mod device;
@@ -72,7 +72,14 @@ pub fn process_file(yaml_file: &Path) -> Result<()> {
 
 /// Gets the absolute path of relpath from the point of view of frompath.
 fn abspath(frompath: &Path, relpath: &Path) -> Result<PathBuf, std::io::Error> {
-    std::fs::canonicalize(frompath.parent().unwrap().join(relpath))
+    normpath::BasePath::new(frompath)
+        .unwrap()
+        .parent()
+        .unwrap()
+        .unwrap()
+        .join(relpath)
+        .canonicalize()
+        .map(|b| b.as_path().into())
 }
 
 /// Recursively loads any included YAML files.

src/test_utils.rs

@@ -39,5 +39,14 @@ pub fn get_patcher(test_subdir: &Path) -> Result<(Device, Hash)> {
 
 /// Gets the absolute path of relpath from the point of view of frompath.
 fn abspath(frompath: &Path, relpath: &Path) -> PathBuf {
-    std::fs::canonicalize(frompath.parent().unwrap().join(relpath)).unwrap()
+    normpath::BasePath::new(frompath)
+        .unwrap()
+        .parent()
+        .unwrap()
+        .unwrap()
+        .join(relpath)
+        .canonicalize()
+        .unwrap()
+        .as_path()
+        .into()
 }

svdtools/patch.py

@@ -978,7 +978,7 @@ def add_cluster(self, cname: str, cadd: OrderedDict[str, Any]) -> None:
                 )
         cnew = ET.SubElement(parent, "cluster")
         ET.SubElement(cnew, "name").text = cname
-        for (key, value) in cadd.items():
+        for key, value in cadd.items():
             # print(key, value)
             if key in {"addressOffset"}:
                 ET.SubElement(cnew, key).text = str(value)
@@ -1299,7 +1299,7 @@ def add_register(self, rname: str, radd: OrderedDict[str, Any]) -> None:
                 )
         rnew = ET.SubElement(parent, "register")
         ET.SubElement(rnew, "name").text = rname
-        for (key, value) in radd.items():
+        for key, value in radd.items():
             if key == "fields":
                 ET.SubElement(rnew, "fields")
                 for fname in value:
@@ -1312,7 +1312,7 @@ def modify_register(self, rspec: str, rmod: OrderedDict[str, Any]) -> None:
         assert isinstance(rspec, str)
         assert isinstance(rmod, OrderedDict)
         for rtag in self.iter_registers(rspec):
-            for (key, value) in rmod.items():
+            for key, value in rmod.items():
                 tag = rtag.find(key)
                 if value == "" and tag is not None:
                     rtag.remove(tag)