Merge #279

279: Prepare for 0.10 release r=torkleyy a=torkleyy

.travis.yml

@@ -33,8 +33,8 @@ script:
 - cargo test --verbose
 - cargo build --verbose --no-default-features
 - cargo test --verbose --no-default-features
-- cargo build --verbose --features serialize
-- cargo test --verbose --features serialize
+- cargo build --verbose --features serde
+- cargo test --verbose --features serde
 - cargo build --verbose --features rudy
 - cargo test --verbose --features rudy
 - cargo build --verbose --features common

Cargo.toml

@@ -38,15 +38,13 @@ tuple_utils = "0.2"
 rayon = "0.8.2"
 
 futures = { version = "0.1", optional = true }
-serde = { version = "1.0", optional = true }
-serde_derive = { version = "1.0", optional = true }
+serde = { version = "1.0", optional = true, features = ["serde_derive"] }
 
 # enable rudy via --features rudy
 rudy = { version = "0.1", optional = true }
 
 [features]
 common = ["futures"]
-serialize = ["serde", "serde_derive"]
 
 [dev-dependencies]
 cgmath =  { version = "0.14", features = ["eders"] }
@@ -74,7 +72,7 @@ required-features = ["common"]
 
 [[example]]
 name = "serialize"
-required-features = ["serialize"]
+required-features = ["serde"]
 
 [workspace]
 members = ["specs-derive"]

book/src/02_hello_world.md

@@ -6,7 +6,7 @@ First of all, thanks for trying out `specs`. Let's
 set it up first. Add the following line to your `Cargo.toml`:
 
 ```toml
-specs = "0.9"
+specs = "0.10"
 ```
 
 And add this to your crate root (`main.rs` or `lib.rs`):

examples/basic.rs

@@ -64,5 +64,5 @@ fn main() {
     let mut dispatcher = DispatcherBuilder::new().add(SysA, "sys_a", &[]).build();
 
     // This dispatches all the systems in parallel (but blocking).
-    dispatcher.dispatch(&mut world.res);
+    dispatcher.dispatch(&world.res);
 }

examples/cluster_bomb.rs

@@ -160,7 +160,7 @@ fn main() {
             break;
         }
 
-        dispatcher.dispatch(&mut world.res);
+        dispatcher.dispatch(&world.res);
 
         // Maintain dynamically added and removed entities in dispatch.
         // This is what actually executes changes done by `LazyUpdate`.

examples/common.rs

@@ -45,7 +45,7 @@ fn main() {
         .add(Merge::<MyFuture>::new(), "merge_my_float", &[])
         .build();
 
-    dispatcher.dispatch(&mut world.res);
+    dispatcher.dispatch(&world.res);
 
     world.write_resource::<Errors>().print_and_exit();
 }

examples/full.rs

@@ -218,12 +218,12 @@ fn main() {
         .add(JoinParallel, "join_par", &[])
         .build();
 
-    dispatcher.dispatch(&mut w.res);
+    dispatcher.dispatch(&w.res);
     w.maintain();
 
     // Insert a component, associated with `e`.
     w.write().insert(e, CompFloat(4.0));
 
-    dispatcher.dispatch(&mut w.res);
+    dispatcher.dispatch(&w.res);
     w.maintain();
 }

examples/serialize.rs

@@ -1,6 +1,5 @@
-extern crate serde;
 #[macro_use]
-extern crate serde_derive;
+extern crate serde;
 extern crate serde_json;
 extern crate shred;
 #[macro_use]

src/lib.rs

@@ -190,11 +190,9 @@ extern crate tuple_utils;
 
 #[cfg(feature = "common")]
 extern crate futures;
-#[cfg(feature = "serialize")]
-extern crate serde;
-#[cfg(feature = "serialize")]
+#[cfg(feature = "serde")]
 #[macro_use]
-extern crate serde_derive;
+extern crate serde;
 
 #[cfg(feature = "rudy")]
 extern crate rudy;
@@ -219,7 +217,7 @@ pub mod common;
 #[cfg(feature = "rudy")]
 pub use storage::RudyStorage;
 
-#[cfg(feature = "serialize")]
+#[cfg(feature = "serde")]
 pub use storage::{MergeError, PackedData};
 
 /// A wrapper for a fetched `Entities` resource.

src/storage/mod.rs

@@ -3,7 +3,7 @@
 pub use self::data::{ReadStorage, WriteStorage};
 pub use self::flagged::FlaggedStorage;
 pub use self::restrict::{Entry, NormalRestriction, ParallelRestriction, RestrictedStorage};
-#[cfg(feature = "serialize")]
+#[cfg(feature = "serde")]
 pub use self::ser::{MergeError, PackedData};
 pub use self::storages::{BTreeStorage, DenseVecStorage, HashMapStorage, NullStorage, VecStorage};
 #[cfg(feature = "rudy")]
@@ -24,7 +24,7 @@ mod data;
 mod drain;
 mod restrict;
 mod flagged;
-#[cfg(feature = "serialize")]
+#[cfg(feature = "serde")]
 mod ser;
 mod storages;
 #[cfg(test)]

src/storage/tests.rs

@@ -698,7 +698,7 @@ mod test {
     }
 }
 
-#[cfg(feature = "serialize")]
+#[cfg(feature = "serde")]
 mod serialize_test {
     extern crate serde_json;