Merge #683

683: Maintenance/682/ongoing code maintenance r=azriel91 a=azriel91

Fixes #682,

## Checklist

* **n/a** I've added tests for all code changes and additions (where applicable)
* **n/a** I've added a demonstration of the new feature to one or more examples
* **n/a** I've updated the book to reflect my changes
* **n/a** Usage of new public items is shown in the API docs

## API changes

Updated `rayon` to `1.3.0`, and `uuid` to `0.8.1`.

Co-authored-by: Azriel Hoh <azriel91@gmail.com>

CHANGELOG.md

@@ -3,14 +3,17 @@
 * Update `syn`, `quote` and `proc-macro2` to `1.0`. ([#648])
 * Implement `ParJoin` for `MaybeJoin` if the inner type is `ParJoin`. ([#655])
 * Remove `"nightly"` feature -- improved panic messages are available on stable. ([#671])
-* Bump `shred` to `0.10.1`. ([#671], [#674])
+* Bump `shred` to `0.10.2`. ([#671], [#674], [#683])
 * Components and resources no longer need to be `Send + Sync` if parallel feature is disabled ([#673], [#674])
+* Bump `uuid` to `0.8.1`. ([#683])
+* Bump `rayon` to `1.3.0`. ([#683])
 
 [#648]: https://github.com/amethyst/specs/pull/648
 [#655]: https://github.com/amethyst/specs/pull/655
 [#671]: https://github.com/slide-rs/specs/pull/671
 [#673]: https://github.com/slide-rs/specs/issues/673
 [#674]: https://github.com/slide-rs/specs/pull/674
+[#683]: https://github.com/slide-rs/specs/pull/683
 
 # 0.15.1
 

Cargo.toml

@@ -22,18 +22,18 @@ autobenches = false
 travis-ci = { repository = "slide-rs/specs" }
 
 [dependencies]
-crossbeam-queue = "0.2"
-hashbrown = "0.6.0"
-hibitset = { version = "0.6.1", default-features = false }
-log = "0.4"
-shred = { version = "0.10.1", default-features = false }
+crossbeam-queue = "0.2.1"
+hashbrown = "0.7.0"
+hibitset = { version = "0.6.2", default-features = false }
+log = "0.4.8"
+shred = { version = "0.10.2", default-features = false }
 shrev = "1.1.1"
-tuple_utils = "0.3"
+tuple_utils = "0.3.0"
 
-rayon = { version = "1.1.0", optional = true }
-serde = { version = "1.0", optional = true, features = ["serde_derive"] }
-specs-derive = { version = "0.4.0", path = "specs-derive", optional = true }
-uuid = { version = "0.7.4", optional = true, features = ["v4", "serde"] }
+rayon = { version = "1.3.0", 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"] }
 
 [features]
 default = ["parallel"]
@@ -49,13 +49,13 @@ shred-derive = ["shred/shred-derive"]
 features = ["parallel", "serde", "shred-derive", "specs-derive", "uuid_entity", "storage-event-control"]
 
 [dev-dependencies]
-nalgebra = "0.19"
-criterion = "0.3"
-ron = "0.5"
-rand = "0.7"
-serde_json = "1.0"
-shred = { version = "0.10.1", default-features = false, features = ["shred-derive"] }
-specs-derive = { path = "specs-derive", version = "0.4.0" }
+nalgebra = "0.19.0"
+criterion = "0.3.1"
+ron = "0.5.1"
+rand = "0.7.3"
+serde_json = "1.0.47"
+shred = { version = "0.10.2", default-features = false, features = ["shred-derive"] }
+specs-derive = { path = "specs-derive", version = "0.4.1" }
 
 [[example]]
 name = "basic"

specs-derive/Cargo.toml

@@ -10,9 +10,9 @@ license = "MIT/Apache-2.0"
 edition = "2018"
 
 [dependencies]
-proc-macro2 = "1.0"
-syn = "1.0"
-quote = "1.0"
+proc-macro2 = "1.0.8"
+syn = "1.0.14"
+quote = "1.0.2"
 
 [lib]
 proc-macro = true

specs-derive/src/impl_saveload.rs

@@ -248,7 +248,7 @@ fn saveload_tuple_struct(
 
     let field_ids = saveload_fields.iter().enumerate().map(|(i, _)| Index {
         index: i as u32,
-        span: data.struct_token.span.clone(),
+        span: data.struct_token.span,
     });
     let tmp = field_ids.clone();
     let ser = quote! {

src/storage/storages.rs

@@ -365,7 +365,7 @@ where
         // swap it into the vec
         std::ptr::swap(self.0.get_unchecked_mut(id as usize), &mut v);
         // return the old value
-        return v;
+        v
     }
 }