From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 22 May 2021 18:33:05 +0000 (+0100)
Subject: shapelib: Break out c_sbbrev in colour handling
X-Git-Tag: otter-0.6.0~71
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fe87694d5375b3f3adac955c0d6374c3bbeafc91;p=otter.git

shapelib: Break out c_sbbrev in colour handling

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index fb0054c9..d2b47cea 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -840,7 +840,8 @@ pub fn load_catalogue(libname: &str, src: &mut dyn LibrarySource) -> Contents {
         for (colour, recolourdata) in &group.d.colours {
           let t_sort = sort.as_ref().map(
             |s| subst(&s, "_c", colour)).transpose()?;
-          let t_item_name = subst(item_name.as_str(), "_c", &recolourdata.abbrev)?;
+          let c_abbrev = &recolourdata.abbrev;
+          let t_item_name = subst(item_name.as_str(), "_c", c_abbrev)?;
           let t_desc = subst(&fe.desc, "_colour", colour)?;
           add1(&t_item_name.try_into()?, t_sort, &t_desc)?;
         }