From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 May 2021 18:39:57 +0000 (+0100)
Subject: shapelib: Break out Registry::add()
X-Git-Tag: otter-0.6.0~269
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a7143b412cb4f33a6e04d80765d060f7fc024066;p=otter.git

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 11205dee..4d9eaec8 100644
--- 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);
 }