work around typetag limitation

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

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 0d231c54fd6755f38cadfab5bd40906fc223016e..56e64c269a2aefdcef0894f6eaca0795dbc900a0 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -80,13 +80,15 @@ type IE = InternalError;
 type IR = Result<(),IE>;
 type SE = SVGProcessingError;
 
-#[typetag::serde]
 pub trait Outline : Send + Debug {
   fn surround_path(&self, pri : &PieceRenderInstructions) -> Result<Html, IE>;
   fn thresh_dragraise(&self, pri : &PieceRenderInstructions)
                       -> Result<Option<Coord>, IE>;
 }
 
+#[typetag::serde]
+pub trait JustOutline : Outline + Send + Debug { }
+
 #[typetag::serde]
 pub trait Piece : Outline + Send + Debug {
   fn resolve_spec_face(&self, face : Option<FaceId>)

diff --git a/src/pieces.rs b/src/pieces.rs
index d5df249ac0e596a8717c0d53318e6688fdb0942f..69aacd7b75aabe905ba23cf17ac1079431b87093 100644 (file)
--- a/src/pieces.rs
+++ b/src/pieces.rs
@@ -99,7 +99,6 @@ pub fn svg_circle_path(diam: f64) -> Html {
   path
 }
 
-#[typetag::serde]
 impl Outline for SimpleShape {
   #[throws(IE)]
   fn surround_path(&self, _pri : &PieceRenderInstructions) -> Html {

diff --git a/src/shapelib.rs b/src/shapelib.rs
index ad007ac7132cc1de06f788c13b9f6225beeb76e1..877b2b82eaf041b809a9a90fcd2303ac946cd7eb 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -124,13 +124,15 @@ struct Item {
   outline: Box<dyn Outline>,
 }
 
-#[typetag::serde(name="Lib")]
 impl Outline for Item { delegate! { to self.outline {
   fn surround_path(&self, pri : &PieceRenderInstructions) -> Result<Html, IE>;
   fn thresh_dragraise(&self, pri : &PieceRenderInstructions)
                       -> Result<Option<Coord>, IE>;
 }}}
 
+#[typetag::serde(name="Lib")]
+impl JustOutline for Item { }
+
 #[typetag::serde(name="Lib")]
 impl Piece for Item {
   #[throws(SpecError)]
@@ -289,7 +291,6 @@ pub fn load(libname: String, dirname: String) {
 #[derive(Serialize,Deserialize,Debug)]
 struct Circle { diam: f64 }
 
-#[typetag::serde(name="Circle")]
 impl Outline for Circle {
   #[throws(IE)]
   fn surround_path(&self, _pri : &PieceRenderInstructions) -> Html {
@@ -301,6 +302,8 @@ impl Outline for Circle {
     Some(self.diam / 2)
   }
 }
+#[typetag::serde(name="Circle")]
+impl JustOutline for Circle { }
 
 #[derive(Deserialize,Debug)]
 struct CircleDefn { }