From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 14 May 2022 12:19:42 +0000 (+0100)
Subject: shapelib: Break out subst_item_name
X-Git-Tag: otter-1.1.0~197
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5c2a84c3799f938b3a843e9c51f5669a03d0d06c;p=otter.git

shapelib: Break out subst_item_name

Magic is going to want this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/shapelib.rs b/src/shapelib.rs
index d4f29abb..d985a05d 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1202,8 +1202,12 @@ fn process_files_entry(
     let sort = sort.as_deref().map(|v| c_abbrev(v)).transpose()?;
     let sort = sort.map(|s| s.into_owned());
 
-    let item_name = c_abbrev(item_name.as_str())?;
-    let item_name = item_name.into_owned().try_into()?;
+    let subst_item_name = |item_name: &GoodItemName| {
+      let item_name = c_abbrev(item_name.as_str())?;
+      let item_name = item_name.into_owned().try_into()?;
+      Ok::<_,LLE>(item_name)
+    };
+    let item_name = subst_item_name(&item_name)?;
 
     let src_name = c_abbrev(&fe.src_file_spec);
     let src_name = src_name.as_deref();