From 5c2a84c3799f938b3a843e9c51f5669a03d0d06c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 May 2022 13:19:42 +0100 Subject: [PATCH] shapelib: Break out subst_item_name Magic is going to want this. Signed-off-by: Ian Jackson --- src/shapelib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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(); -- 2.30.2