shapelib: Break out Registry::add()

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 11205dee32310f13c4210c372b7da189e4d142de..4d9eaec86b77a02ece11a96c401975c0f9aaab9c 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -347,6 +347,14 @@ impl OccultedPieceTrait for Item {
   }
 }
 
+impl Registry {
+  pub fn add(&mut self, data: Contents) {
+    self.libs
+      .entry(data.libname.clone()).or_default()
+      .push(data);
+  }
+}
+
 pub struct AllRegistries<'ig> {
   global: RwLockReadGuard<'static, Option<Registry>>,
   #[allow(dead_code)] ig: &'ig Instance,
@@ -821,9 +829,7 @@ pub fn load_1_global_library(l: &Explicit1) {
   let count = data.items.len();
   GLOBAL_SHAPELIBS.write()
     .get_or_insert_with(default)
-    .libs
-    .entry(l.name.clone()).or_default()
-    .push(data);
+    .add(data);
   info!("loaded {} shapes in library {:?} from {:?} and {:?}",
         count, &l.name, &l.catalogue, &l.dirname);
 }