Merge pull request #748 from xMAC94x/xMAC94x/update_hashbrown12

update all depdnencies including hashbrown

Cargo.toml

@@ -23,24 +23,23 @@ travis-ci = { repository = "slide-rs/specs" }
 
 [dependencies]
 crossbeam-queue = "0.3"
-hashbrown = "0.11"
+hashbrown = "0.12"
 hibitset = { version = "0.6.3", default-features = false }
 log = "0.4.8"
-shred = { version = "0.12", default-features = false }
+shred = { version = "0.13", default-features = false }
 shrev = "1.1.1"
-tuple_utils = "0.3.0"
+tuple_utils = "0.4.0"
 
 rayon = { version = "1.5.1", optional = true }
 serde = { version = "1.0.104", optional = true, features = ["serde_derive"] }
 specs-derive = { version = "0.4.1", path = "specs-derive", optional = true }
-uuid = { version = "0.8.1", optional = true, features = ["v4", "serde"] }
+uuid = { version = "1.0", optional = true, features = ["v4", "serde"] }
 
 [features]
 default = ["parallel"]
 parallel = ["rayon", "shred/parallel", "hibitset/parallel"]
 uuid_entity = ["uuid", "serde"]
-stdweb = ["uuid/stdweb"]
-wasm-bindgen = ["uuid/wasm-bindgen"]
+stdweb = ["uuid/js"]
 storage-event-control = []
 derive = ["shred-derive", "specs-derive"]
 nightly = []
@@ -51,12 +50,12 @@ shred-derive = ["shred/shred-derive"]
 features = ["parallel", "serde", "shred-derive", "specs-derive", "uuid_entity", "storage-event-control"]
 
 [dev-dependencies]
-nalgebra = "0.24"
+nalgebra = "0.31"
 criterion = "0.3.1"
-ron = "0.5.1"
+ron = "0.7.1"
 rand = "0.8"
 serde_json = "1.0.48"
-shred = { version = "0.12.0", default-features = false, features = ["shred-derive"] }
+shred = { version = "0.13.0", default-features = false, features = ["shred-derive"] }
 specs-derive = { path = "specs-derive", version = "0.4.1" }
 
 [[example]]

examples/saveload.rs

@@ -4,6 +4,7 @@ extern crate serde;
 extern crate specs;
 
 use std::{convert::Infallible, fmt};
+use ron::ser::PrettyConfig;
 
 use specs::{
     prelude::*,
@@ -67,11 +68,11 @@ impl Component for Mass {
 // type that implements the `Display`-trait. In this case we want to be able to
 // return different errors, and we are going to use a `.ron`-file to store our
 // data. Therefore we use a custom enum, which can display both the
-// `Infallible`and `ron::ser::Error` type. This enum could be extended to
+// `Infallible`and `ron::error::Error` type. This enum could be extended to
 // incorporate for example `std::io::Error` and more.
 #[derive(Debug)]
 enum Combined {
-    Ron(ron::ser::Error),
+    Ron(ron::error::Error),
 }
 
 // Implementing the required `Display`-trait, by matching the `Combined` enum,
@@ -86,8 +87,8 @@ impl fmt::Display for Combined {
 
 // This returns the `ron::ser:Error` in form of the `Combined` enum, which can
 // then be matched and displayed accordingly.
-impl From<ron::ser::Error> for Combined {
-    fn from(x: ron::ser::Error) -> Self {
+impl From<ron::error::Error> for Combined {
+    fn from(x: ron::error::Error) -> Self {
         Combined::Ron(x)
     }
 }
@@ -153,7 +154,10 @@ fn main() {
         fn run(&mut self, (ents, pos, mass, markers): Self::SystemData) {
             // First we need a serializer for the format of choice, in this case the
             // `.ron`-format.
-            let mut ser = ron::ser::Serializer::new(Some(Default::default()), true);
+            let mut buf = Vec::new();
+            let mut config = PrettyConfig::default();
+            config.struct_names = true;
+            let mut ser = ron::ser::Serializer::with_options(&mut buf, Some(config), Default::default()).unwrap();
 
             // For serialization we use the
             // [`SerializeComponents`](struct.SerializeComponents.html)-trait's `serialize`
@@ -183,7 +187,7 @@ fn main() {
 
             // At this point, `ser` could be used to write its contents to a file, which is
             // not done here. Instead we print the content of this pseudo-file.
-            println!("{}", ser.into_output_string());
+            println!("{}", String::from_utf8(buf).expect("Ron should be utf-8"));
         }
     }
 

src/saveload/tests.rs

@@ -62,7 +62,10 @@ mod marker_test {
             .build();
 
         // Serialize all entities
-        let mut ser = ron::ser::Serializer::new(Some(Default::default()), true);
+        let mut buf = Vec::new();
+        let mut config = ron::ser::PrettyConfig::default();
+        config.struct_names = true;
+        let mut ser = ron::ser::Serializer::with_options(&mut buf, Some(config), Default::default()).unwrap();
 
         world.exec(
             |(ents, comp_a, comp_b, markers, _alloc): (
@@ -82,7 +85,7 @@ mod marker_test {
             },
         );
 
-        let serial = ser.into_output_string();
+        let serial = String::from_utf8(buf).expect("Ron should be utf-8");
 
         let mut de = ron::de::Deserializer::from_str(&serial).unwrap();