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 02c77023a24b52a67b385a618d831398abfe7de3..0a9dc86195624a894e6ecaeda903f922c9e4d87f 100644 (file)
--- 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 0df9e8235273ac6edeef81c5751e4f95a00b6198..573fdfd76162c6e86366fa23a04c622c843747e8 100644 (file)
--- 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(),
           }))