chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 755bde3)
Make GenericSimpleShape generic over Outl too
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 20 Feb 2021 10:53:34 +0000 (10:53 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 20 Feb 2021 10:53:34 +0000 (10:53 +0000)
NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/hand.rs patch | blob | history
src/pieces.rs patch | blob | history

diff --git a/src/hand.rs b/src/hand.rs
index a73c1e4c15dec88b28f8689e54b3a290528f850b..77384f8ab1bf06df39fbce50d8717d687d96793b 100644 (file)
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -16,7 +16,7 @@ struct MagicOwner {
 
 #[derive(Debug,Serialize,Deserialize)]
 struct Hand {
-  shape: GenericSimpleShape<()>,
+  shape: GenericSimpleShape<(), OutlineRepr>,
 }
 
 #[derive(Debug,Clone,Default,Serialize,Deserialize)]
diff --git a/src/pieces.rs b/src/pieces.rs
index 2680fe58821a7fecf53d2c175429cf2b4c64d16e..2f11d0374df5a9a540b4708c2c08bd3ec089448d 100644 (file)
--- a/src/pieces.rs
+++ b/src/pieces.rs
@@ -12,15 +12,15 @@ type ColourMap = IndexVec<FaceId, Colour>;
 
 #[derive(Debug,Serialize,Deserialize)]
 // todo: this serialisation is rather large
-pub struct GenericSimpleShape<Desc> {
+pub struct GenericSimpleShape<Desc, Outl> {
   pub desc: Desc,
   colours: ColourMap,
   #[serde(default)] pub edges: ColourMap,
   #[serde(default="default_edge_width")] pub edge_width: f64,
   pub itemname: String,
-  pub outline: OutlineRepr,
+  pub outline: Outl,
 }
-pub type SimpleShape = GenericSimpleShape<Html>;
+pub type SimpleShape = GenericSimpleShape<Html, OutlineRepr>;
 
 pub const SELECT_SCALE: f64 = 1.1;
 
@@ -111,8 +111,9 @@ pub fn svg_rectangle_path(PosC([x,y]): PosC<f64>) -> Html {
                -x*0.5, -y*0.5, x, y, -x))
 }
 
-impl<Desc> Outline for GenericSimpleShape<Desc>
-    where Desc: Debug + Send + Sync + 'static
+impl<Desc, Outl> Outline for GenericSimpleShape<Desc, Outl>
+    where Desc: Debug + Send + Sync + 'static,
+          Outl: Outline,
 {
   delegate! {
     to self.outline {
@@ -147,8 +148,9 @@ impl Piece for SimpleShape {
   fn itemname(&self) -> &str { self.itemname() }
 }
 
-impl<Desc> GenericSimpleShape<Desc>
-    where Desc: Debug + Send + Sync + 'static
+impl<Desc, Outl> GenericSimpleShape<Desc, Outl>
+    where Desc: Debug + Send + Sync + 'static,
+          Outl: Outline,
 {
   pub fn count_faces(&self) -> usize {
     max(self.colours.len(), self.edges.len())
@@ -156,10 +158,10 @@ impl<Desc> GenericSimpleShape<Desc>
   pub fn itemname(&self) -> &str { &self.itemname }
 
   #[throws(SpecError)]
-  pub fn new(desc: Desc, outline: OutlineRepr,
+  pub fn new(desc: Desc, outline: Outl,
          def_itemname: &'_ str,
          common: &SimpleCommon)
-         -> GenericSimpleShape<Desc>
+         -> GenericSimpleShape<Desc, Outl>
   {
     let itemname = common.itemname.clone()
       .unwrap_or_else(|| def_itemname.to_string());
Unnamed repository; edit this file 'description' to name the repository.