Merge pull request #224 from jannic-dev-forks/interpolate-none-path

Let opt_interpolate return the plain string if path is None

Author: burrbull

CHANGELOG-rust.md

@@ -5,6 +5,8 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+* If there is no path to interpolate, show unmodified `description`.
+
 ## [v0.3.13] 2024-03-29
 
 * Interpolate path and name in `description` and `derivedFrom`

src/patch/mod.rs

@@ -804,7 +804,11 @@ impl Spec for str {
 }
 
 fn opt_interpolate<T: Interpolate>(path: &Option<&T>, s: Option<&str>) -> Option<String> {
-    path.and_then(|path| path.interpolate_opt(s))
+    if let Some(path) = path {
+        path.interpolate_opt(s)
+    } else {
+        s.map(ToString::to_string)
+    }
 }
 
 trait Interpolate {