From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 12 Feb 2021 22:57:40 +0000 (+0000)
Subject: make FaceColourSpecs a type in specs
X-Git-Tag: otter-0.4.0~533
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=51ca7dc45e138e2090f7d224535627d00e3fafd4;p=otter.git

make FaceColourSpecs a type in specs

NFC

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

diff --git a/src/imports.rs b/src/imports.rs
index df047818..b08cded4 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -101,6 +101,7 @@ pub use crate::pieces::*;
 pub use crate::shapelib;
 pub use crate::slotmap_slot_idx::*;
 pub use crate::spec::*;
+pub use crate::spec::piece_specs::FaceColourSpecs;
 pub use crate::sse;
 pub use crate::toml_de;
 pub use crate::tz::*;
diff --git a/src/pieces.rs b/src/pieces.rs
index 10a1c126..7c615cb9 100644
--- a/src/pieces.rs
+++ b/src/pieces.rs
@@ -153,12 +153,10 @@ impl SimpleShape {
   }
 }
 
-type FacesSpec = IndexVec<FaceId,ColourSpec>;
-
 trait SimplePieceSpec {
   fn outline(&self) -> Result<Box<dyn Outline>, SpecError>;
   fn path(&self) -> Result<Html, SpecError>;
-  fn faces(&self) -> Result<&FacesSpec, SpecError>;
+  fn faces(&self) -> Result<&FaceColourSpecs, SpecError>;
   fn desc(&self) -> Result<Html, SpecError>;
   fn itemname(&self) -> Result<String, SpecError>;
 
@@ -179,7 +177,7 @@ impl SimplePieceSpec for piece_specs::Disc {
   #[throws(SpecError)] fn path(&self) -> Html {
     svg_circle_path(self.diam as f64)?
   }
-  #[throws(SpecError)] fn faces(&self) -> &FacesSpec { &self.faces }
+  #[throws(SpecError)] fn faces(&self) -> &FaceColourSpecs { &self.faces }
   #[throws(SpecError)] fn desc(&self) -> Html { Html::lit("disc") }
   #[throws(SpecError)] fn itemname(&self) -> String {
     self.itemname.clone()
@@ -211,7 +209,7 @@ impl SimplePieceSpec for piece_specs::Square {
   #[throws(SpecError)] fn path(&self) -> Html {
     svg_rectangle_path(self.xy()?.promote())?
   }
-  #[throws(SpecError)] fn faces(&self) -> &FacesSpec { &self.faces }
+  #[throws(SpecError)] fn faces(&self) -> &FaceColourSpecs { &self.faces }
   #[throws(SpecError)] fn desc(&self) -> Html { Html::lit("square") }
   #[throws(SpecError)] fn itemname(&self) -> String {
     self.itemname.clone()
diff --git a/src/spec.rs b/src/spec.rs
index 73caaeaf..59d55273 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -192,6 +192,8 @@ pub struct CompassAngle(u8);
 pub mod piece_specs {
   use super::*;
 
+  pub type FaceColourSpecs = IndexVec<FaceId,ColourSpec>;
+
   #[derive(Debug,Serialize,Deserialize)]
   pub struct Disc {
     pub itemname: Option<String>,