From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Mar 2021 15:33:17 +0000 (+0000)
Subject: hidden: sprinkle a few Arc about
X-Git-Tag: otter-0.4.0~171
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7a5757080fc4413a712b4127b57229c275396ea9;p=otter.git

hidden: sprinkle a few Arc about

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

diff --git a/src/occultilks.rs b/src/occultilks.rs
index 02c77023..0a9dc861 100644
--- a/src/occultilks.rs
+++ b/src/occultilks.rs
@@ -14,7 +14,7 @@ pub struct OccultIlkOwningId(Id);
 #[derive(Debug,Clone,Eq,PartialEq,Ord,PartialOrd,Hash)]
 #[derive(Serialize,Deserialize)]
 #[serde(transparent)]
-pub struct OccultIlkName(pub String);
+pub struct OccultIlkName(pub Arc<String>);
 
 #[derive(Debug,Serialize,Deserialize)]
 pub struct OccultIlkData {
diff --git a/src/shapelib.rs b/src/shapelib.rs
index 0df9e823..573fdfd7 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -52,7 +52,7 @@ struct ItemData {
 
 #[derive(Debug,Clone)]
 struct OccData {
-  item_name: String,
+  item_name: Arc<String>,
   outline: Outline,
   desc: Html,
 }
@@ -405,7 +405,7 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
             throw!(LLE::OccultationColourMissing(colour.clone()));
           }
           Some(Arc::new(OccData {
-            item_name: subst(&item_name, "_c", &colour)?,
+            item_name: Arc::new(subst(&item_name, "_c", &colour)?),
             desc: Html(subst(&fe.desc.0, "_colour", "")?),
             outline: outline.clone(),
           }))