wip serde for SimplePiece

diff --git a/Cargo.lock.example b/Cargo.lock.example
index bb5195d8ddb2bd6b8e048d8b706feb8be6159d50..6b7b57abcd94cc2f9ca050f9cca0210bcb58bd5d 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -502,6 +502,9 @@ name = "index_vec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52fb664a32d8c1f30a4693137066dd1c3bd67c8edc544281ec3d7cdc8230ed32"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "indexmap"

diff --git a/Cargo.toml b/Cargo.toml
index c120e7326d51bd1c7b5996241a26eb3ec8467929..8814790dd71e8bdba2d2615f33fee6d90c51bd0c 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ lazy_static = "1.0.0"
 slotmap = { version = "0.4", features = ['serde'] }
 fehler = "1"
 
-index_vec = "0.1.1"
+index_vec = { version = "0.1.1", features = ['serde'] }
 
 num-traits = "0.2"
 

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 5350e5bfb5846886a3566edf6495e4c07aeeb2cd..8e176026175182fa2cb43b94516981646256a1d0 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -10,8 +10,6 @@ slotmap::new_key_type!{
 }
 
 define_index_type! {
-  #[derive(Serialize,Deserialize)]
-  #[serde(transparent)]
   pub struct FaceId = u8;
 }
 

diff --git a/src/pieces.rs b/src/pieces.rs
index a816f9ae6ad62d3e3b2942ca295b3a40456bca4e..e35ca68ca2daee6eed2cc43cb7d688a49099eedd 100644 (file)
--- a/src/pieces.rs
+++ b/src/pieces.rs
@@ -3,7 +3,7 @@ use crate::imports::*;
 
 type ColourMap = IndexVec<FaceId,Colour>;
 
-#[derive(Debug)]
+#[derive(Debug,Serialize,Deserialize)]
 struct SimpleShape {
   desc : String,
   path : String,