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 0f98600090dcc3321365925542f5aa4bf0bf7a48..6f9d1eda91c8059bf0408f837c48d33e695be362 100644 (file)
--- 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 {