From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Mar 2021 15:00:18 +0000 (+0000)
Subject: shapelib hidden: Move item_name binding earlier
X-Git-Tag: otter-0.4.0~177
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f14bc5cea9db82a93d5cc8d6da95c14497c1e48a;p=otter.git

shapelib hidden: Move item_name binding earlier

nfc

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 0f986000..6f9d1eda 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -373,6 +373,9 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
           + rhs
       }
 
+      let item_name = format!("{}{}{}", gdefn.item_prefix,
+                              fe.item_spec, gdefn.item_suffix);
+
       let mut add1 = |item_name: &str, desc| {
         let idata = ItemData {
           group: group.clone(),
@@ -393,9 +396,6 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
         Ok::<_,LLE>(())
       };
 
-      let item_name = format!("{}{}{}", gdefn.item_prefix,
-                              fe.item_spec, gdefn.item_suffix);
-
       if group.d.colours.is_empty() {
         add1(&item_name, fe.desc.clone())?;
       } else {