Make OccultIlkName a type alias, not a newtype

There's not really an abstraction here defending anything, and it
lacks constructors etc.  Just abolish it.

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

diff --git a/src/occultilks.rs b/src/occultilks.rs
index 0c63c53ca00bacf6c996bcd0335763a935d40b35..f9d6ccd759e03653dfb8806d5ad310610a079cf6 100644 (file)
--- a/src/occultilks.rs
+++ b/src/occultilks.rs
@@ -11,10 +11,7 @@ slotmap::new_key_type!{ pub struct OccultIlkId; }
 #[serde(transparent)]
 pub struct OccultIlkOwningId(Id);
 
-#[derive(Debug,Clone,Eq,PartialEq,Ord,PartialOrd,Hash)]
-#[derive(Serialize,Deserialize)]
-#[serde(transparent)]
-pub struct OccultIlkName(pub Arc<GoodItemName>);
+pub type OccultIlkName = Arc<GoodItemName>;
 
 #[derive(Debug,Serialize,Deserialize)]
 pub struct OccultIlkData {

diff --git a/src/shapelib.rs b/src/shapelib.rs
index c7e7c780737d3136aafddf08581e8c5c2adac50b..a42422780309e5a38a9efd8be588070c7eec23d2 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -602,7 +602,7 @@ impl Contents {
           desc: occ.desc.clone(),
           outline: occ.outline.clone(),
         }) as Arc<dyn InertPieceTrait>;
-        Some((OccultIlkName(occ_name.into_inner()), it))
+        Some((occ_name.into_inner(), it))
       },
     };