Extend component list

.gitignore

@@ -1,5 +1,6 @@
 # Generated by Cargo
 /target/
+/specs_derive/target/
 Cargo.lock
 
 # Generated by mdbook

.travis.yml

@@ -1,6 +1,7 @@
 language: rust
 rust:
 - nightly
+- beta
 - stable
 
 branches:

Cargo.toml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [package]
 name = "specs"
 version = "0.9.2"
@@ -50,9 +49,10 @@ common = ["futures"]
 serialize = ["serde", "serde_derive"]
 
 [dev-dependencies]
-cgmath =  { version = "0.14", features = ["eders"] }
+cgmath = { version = "0.14", features = ["eders"] }
 rand = "0.3"
 serde_json = "1.0"
+specs_derive = { path = "specs_derive", version = "0.1", features = ["serialize"] }
 
 [[example]]
 name = "basic"
@@ -68,3 +68,6 @@ required-features = ["common"]
 name = "serialize"
 required-features = ["serialize"]
 
+[[example]]
+name = "derive"
+required-features = ["serialize"]

specs_derive/examples/derive.rs → examples/derive.rs

@@ -6,18 +6,13 @@ extern crate specs;
 #[macro_use]
 extern crate specs_derive;
 
-#[cfg(feature="serialize")]
 extern crate serde;
-#[cfg(feature="serialize")]
 #[macro_use]
 extern crate serde_derive;
-#[cfg(feature="serialize")]
 extern crate serde_json;
 
-#[cfg(feature="serialize")]
 fn main() {
-    use specs::{Component, ComponentGroup, DeconstructedGroup, DispatcherBuilder, Entities, EntitiesRes, Join, SerializeGroup, System, ReadStorage, Split, VecStorage, WriteStorage, World, WorldDeserializer, WorldSerializer};
-    use serde::{Deserialize, Serialize};
+    use specs::{Component, ComponentGroup, DeconstructedGroup, DispatcherBuilder, Entities, Join, System, Split, VecStorage, WriteStorage, World, WorldDeserializer, WorldSerializer};
     use serde::de::DeserializeSeed;
 
     #[derive(Debug, Serialize, Deserialize)]
@@ -54,7 +49,6 @@ fn main() {
     #[allow(dead_code)]
     struct SomeGroup {
         #[group(serialize)]
-        #[group(id = "5")]
         field1: Comp1,
 
         #[group(serialize)]
@@ -145,7 +139,7 @@ fn main() {
 
         let world_deserializer = WorldDeserializer::<SomeGroup>::new(&mut world, entity_list.as_slice());
         let mut json_deserializer = serde_json::Deserializer::from_str(&serialized);
-        world_deserializer.deserialize(&mut json_deserializer);
+        let _ = world_deserializer.deserialize(&mut json_deserializer);
     }
 
     {
@@ -188,7 +182,3 @@ fn main() {
     );
 }
 
-#[cfg(not(feature="serialize"))]
-fn main() {
-    println!("Requires `serialize` flag to run");
-}

specs/examples/serialize.rs → examples/serialize.rs

@@ -32,6 +32,7 @@ fn main() {
     }
 
     #[derive(ComponentGroup)]
+    #[allow(dead_code)]
     struct SerialGroup {
         #[group(serialize)]
         comp_serialize: CompSerialize,
@@ -183,7 +184,7 @@ fn main() {
 
         let world_deserializer = WorldDeserializer::<SerialGroup>::new(&mut world, entity_list.as_slice());
         let mut json_deserializer = serde_json::Deserializer::from_str(&serialized);
-        world_deserializer.deserialize(&mut json_deserializer);
+        let _ = world_deserializer.deserialize(&mut json_deserializer);
     }
 
     {

specs_derive/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Aceeri <conmcclusk@gmail.com>"]
 proc-macro = true
 
 [dependencies]
-specs = { path = "../specs", version = "0.9.1" }
+specs = { path = "../", version = "0.9.2" }
 syn = "0.11.10"
 quote = "0.3.15"
 serde = { version = "1.0", optional = true }
@@ -19,3 +19,4 @@ serde_json = "1.0"
 [features]
 default = []
 serialize = ["serde", "specs/serialize"]
+