Merge amethyst#2136

2136: Bumped dependency versions. r=azriel91 a=azriel91

## Description

Updated dependency versions, excluding:

* rendy
* palette: need to update this in `rendy`
* image: need to update this in `rendy`
* rodio: see amethyst#2044
* cpal: see amethyst#2044
* objekt: crate renamed to `dyn-clone`, but asset implementation is going to be replaced with `atelier-assets`.

## PR Checklist

By placing an x in the boxes I certify that I have:

- [x] Updated the content of the book if this PR would make the book outdated.
- [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
- **n/a** Added unit tests for new code added in this PR.
- [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.

If this modified or created any rs files:

- [x] Ran `cargo +stable fmt --all`
- [x] Ran `cargo clippy --all --features "empty"`
- [x] Ran `cargo test --all --features "empty"`


Co-authored-by: Azriel Hoh <[email protected]>

Cargo.toml

@@ -65,20 +65,6 @@ profiler = [
     "amethyst_utils/profiler",
     "amethyst_tiles/profiler",
 ]
-nightly = [
-    "amethyst_animation/nightly",
-    "amethyst_assets/nightly",
-    "amethyst_audio/nightly",
-    "amethyst_config/nightly",
-    "amethyst_core/nightly",
-    "amethyst_controls/nightly",
-    "amethyst_network/nightly",
-    "amethyst_rendy/nightly",
-    "amethyst_input/nightly",
-    "amethyst_ui/nightly",
-    "amethyst_utils/nightly",
-    "amethyst_tiles/nightly",
-]
 sdl_controller = [
     "amethyst_input/sdl_controller",
 ]
@@ -140,31 +126,31 @@ amethyst_ui = { path = "amethyst_ui", version = "0.9.0" }
 amethyst_utils = { path = "amethyst_utils", version = "0.9.0" }
 amethyst_window = { path = "amethyst_window", version = "0.4.0" }
 amethyst_tiles = { path = "amethyst_tiles", version = "0.2.0", optional = true }
-crossbeam-channel = "0.3.9"
-derivative = "1.0"
-fern = { version = "0.5", features = ["colored"] }
-log = { version = "0.4.6", features = ["serde"] }
-rayon = "1.1.0"
-rustc_version_runtime = "0.1"
+crossbeam-channel = "0.4.0"
+derivative = "1.0.3"
+fern = { version = "0.5.9", features = ["colored"] }
+log = { version = "0.4.8", features = ["serde"] }
+rayon = "1.3.0"
+rustc_version_runtime = "0.1.5"
 sentry = { version = "0.17.0", optional = true }
 winit = { version = "0.19", features = ["serde", "icon_loading"] }
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0.104", features = ["derive"] }
 palette = { version = "0.4", features = ["serde"] }
-failure = "0.1"
-thread_profiler = { version = "0.3", optional = true }
-lazy_static = "1.3"
-glsl-layout = "0.3"
+failure = "0.1.6"
+thread_profiler = { version = "0.3.0", optional = true }
+lazy_static = "1.4.0"
+glsl-layout = "0.3.2"
 
 [dev-dependencies]
-derive-new = "0.5"
+derive-new = "0.5.8"
 env_logger = "0.7.1"
-genmesh = "0.6"
-ron = "0.5"
-specs-derive = "0.4"
+genmesh = "0.6.2"
+ron = "0.5.1"
+specs-derive = "0.4.1"
 
 [build-dependencies]
 dirs = "2.0.2"
-vergen = "3.0"
+vergen = "3.0.4"
 
 [[example]]
 name = "hello_world"

Jenkinsfile

@@ -59,7 +59,7 @@ pipeline {
                         sh 'cargo update'
                         // Perform actual check
                         echo 'Running Cargo check...'
-                        sh 'cargo check --all --all-targets --features "nightly vulkan sdl_controller json saveload tiles"'
+                        sh 'cargo check --all --all-targets --features "vulkan sdl_controller json saveload tiles"'
                     }
                 }
             }

amethyst_animation/Cargo.toml

@@ -36,4 +36,3 @@ thread_profiler = { version = "0.3", optional = true }
 
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
-nightly = [ "amethyst_core/nightly" ]

amethyst_assets/Cargo.toml

@@ -28,22 +28,21 @@ derivative = "1.0"
 derive-new = "0.5"
 fnv = "1"
 log = "0.4.6"
-parking_lot = "0.9"
-rayon = "1.1.0"
+parking_lot = "0.10"
+rayon = "1.3.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", optional = true }
 ron = "0.5"
 thread_profiler = { version = "0.3", optional = true }
-err-derive = "0.1"
+err-derive = "0.2"
 objekt = "0.1.2"
 erased-serde = "0.3.9"
-inventory = "0.1.3"
-lazy_static = "1.3"
+inventory = "0.1.5"
+lazy_static = "1.4"
 
 [dev-dependencies]
 serde_json = "1"
 
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
-nightly = [ "amethyst_core/nightly" ]
 json = [ "serde_json" ]

amethyst_assets/src/prefab/system.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, marker::PhantomData, ops::Deref};
+use std::{collections::HashMap, marker::PhantomData};
 
 use derivative::Derivative;
 use log::error;
@@ -102,7 +102,7 @@ where
             mut tags,
             mut prefab_system_data,
         ) = data;
-        let strategy = strategy.as_ref().map(Deref::deref);
+        let strategy = strategy.as_deref();
         prefab_storage.process(
             |mut d| {
                 d.tag = Some(self.next_tag);

amethyst_assets/src/storage.rs

@@ -541,13 +541,11 @@ where
         #[cfg(feature = "profiler")]
         profile_scope!("processor_system");
 
-        use std::ops::Deref;
-
         storage.process(
             ProcessableAsset::process,
             time.frame_number(),
             &**pool,
-            strategy.as_ref().map(Deref::deref),
+            strategy.as_deref(),
         );
     }
 }

amethyst_audio/Cargo.toml

@@ -27,12 +27,11 @@ derive-new = "0.5"
 log = "0.4.6"
 rodio = "0.9"
 serde = { version = "1.0", features = ["derive"] }
-smallvec = { version = "1.0", features = ["serde"] }
+smallvec = { version = "1.2", features = ["serde"] }
 thread_profiler = { version = "0.3", optional = true }
 
 [dev-dependencies]
 amethyst_utils = { path = "../amethyst_utils", version = "0.9.0"}
 
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
-nightly = [ "amethyst_core/nightly" ]

amethyst_config/Cargo.toml

@@ -27,4 +27,3 @@ serde_derive = "1"
 
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
-nightly = []

amethyst_controls/Cargo.toml

@@ -29,4 +29,3 @@ thread_profiler = { version = "0.3", optional = true }
 
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
-nightly = [ "amethyst_core/nightly" ]

amethyst_core/Cargo.toml

@@ -16,20 +16,20 @@ travis-ci = { repository = "amethyst/amethyst" }
 
 [dependencies]
 nalgebra = { version = "0.19.0", features = ["serde-serialize", "mint"] }
-alga = { version = "0.9.0", default-features = false }
-alga_derive = "0.9.0"
-approx = "0.3"
+alga = { version = "0.9.2", default-features = false }
+alga_derive = "0.9.1"
+approx = "0.3.2"
 amethyst_error = { path = "../amethyst_error", version = "0.4.0" }
-fnv = "1"
-log = "0.4.6"
-num-traits = "0.2.0"
-rayon = "1.1.0"
+fnv = "1.0.6"
+log = "0.4.8"
+num-traits = "0.2.11"
+rayon = "1.3.0"
 serde = { version = "1", features = ["derive"] }
-specs = { version = "0.15.1", default-features = false, features = ["shred-derive", "specs-derive"] }
-specs-hierarchy = { version = "0.5.1", default-features = false }
-getset = "0.0.8"
-derive-new = "0.5.6"
-derivative = "1.0"
+specs = { version = "0.16.0", default-features = false, features = ["shred-derive", "specs-derive"] }
+specs-hierarchy = { version = "0.6", default-features = false }
+getset = "0.0.9"
+derive-new = "0.5.8"
+derivative = "1.0.3"
 
 thread_profiler = { version = "0.3", optional = true }
 
@@ -40,5 +40,4 @@ ron = "0.5.1"
 [features]
 default = ["specs/parallel", "specs-hierarchy/parallel"]
 profiler = ["thread_profiler/thread_profiler"]
-nightly = ["specs/nightly"]
 saveload = ["specs/serde"]

amethyst_core/src/event.rs

@@ -70,7 +70,7 @@ mod tests {
 
     impl From<TestEvent> for AggregateEvent {
         fn from(event: TestEvent) -> Self {
-            AggregateEvent::Test(event.clone())
+            AggregateEvent::Test(event)
         }
     }
 

amethyst_core/src/transform/systems.rs

@@ -371,7 +371,7 @@ mod tests {
         // Release the indeterminate forms!
         local.set_translation_xyz(0.0 / 0.0, 0.0 / 0.0, 0.0 / 0.0);
 
-        world.create_entity().with(local.clone()).build();
+        world.create_entity().with(local).build();
 
         hs.run_now(&world);
         system.run_now(&world);
@@ -386,7 +386,7 @@ mod tests {
         let mut local = Transform::default();
         // Release the indeterminate forms!
         local.set_translation_xyz(1.0 / 0.0, 1.0 / 0.0, 1.0 / 0.0);
-        world.create_entity().with(local.clone()).build();
+        world.create_entity().with(local).build();
 
         hs.run_now(&world);
         system.run_now(&world);

amethyst_derive/Cargo.toml

@@ -19,7 +19,7 @@ heck = "0.3.1"
 syn = { version = "1.0", features = ["full", "visit"] }
 quote = "1.0"
 proc-macro2 = "1.0"
-proc_macro_roids = "0.6"
+proc_macro_roids = "0.7"
 proc-macro-crate = "0.1"
 
 [dev-dependencies]

amethyst_derive/src/lib.rs

@@ -4,13 +4,13 @@
 #![recursion_limit = "256"]
 #![warn(
     missing_debug_implementations,
+    missing_docs,
     rust_2018_idioms,
     rust_2018_compatibility,
     clippy::all
 )]
-// #![warn(missing_docs)]
-// missing_docs is disabled for this crate because of a bug in current rust stable:
-// https://github.com/rust-lang/rust/issues/42008
+// Needed because `nightly` warns on `extern crate proc_macro;`, but `stable` still requires it.
+#![allow(unused_extern_crates)]
 
 extern crate proc_macro;
 

amethyst_derive/tests/test.rs

@@ -140,13 +140,12 @@ mod tests {
                 let entities = world.read_resource::<EntitiesRes>();
                 let storage = world.read_storage::<External>();
 
-                assert_eq!(
-                    (&entities, &storage)
-                        .join()
-                        .map(|(_, ex)| assert_eq!(ex.inner, 100))
-                        .count(),
-                    1
-                );
+                let entities_components = (&entities, &storage).join().collect::<Vec<_>>();
+
+                assert_eq!(entities_components.len(), 1);
+                entities_components
+                    .into_iter()
+                    .for_each(|(_, ex)| assert_eq!(ex.inner, 100));
             }
         );
     }
@@ -162,13 +161,12 @@ mod tests {
                 let entities = world.read_resource::<EntitiesRes>();
                 let storage = world.read_storage::<Stuff<usize>>();
 
-                assert_eq!(
-                    (&entities, &storage)
-                        .join()
-                        .map(|(_, ex)| assert_eq!(ex.inner, 1))
-                        .count(),
-                    1
-                );
+                let entities_components = (&entities, &storage).join().collect::<Vec<_>>();
+
+                assert_eq!(entities_components.len(), 1);
+                entities_components
+                    .into_iter()
+                    .for_each(|(_, ex)| assert_eq!(ex.inner, 1));
             }
         );
     }
@@ -184,13 +182,12 @@ mod tests {
                 let entities = world.read_resource::<EntitiesRes>();
                 let storage = world.read_storage::<External>();
 
-                assert_eq!(
-                    (&entities, &storage)
-                        .join()
-                        .map(|(_, ex)| assert_eq!(ex.inner, 2))
-                        .count(),
-                    1
-                );
+                let entities_components = (&entities, &storage).join().collect::<Vec<_>>();
+
+                assert_eq!(entities_components.len(), 1);
+                entities_components
+                    .into_iter()
+                    .for_each(|(_, ex)| assert_eq!(ex.inner, 2));
             }
         );
     }
@@ -210,16 +207,15 @@ mod tests {
                 let stuff_storage = world.read_storage::<Stuff<String>>();
                 let external_storage = world.read_storage::<External>();
 
-                assert_eq!(
-                    (&entities, &stuff_storage, &external_storage)
-                        .join()
-                        .map(|(_, st, ex)| {
-                            assert_eq!(st.inner, "three");
-                            assert_eq!(ex.inner, 4);
-                        })
-                        .count(),
-                    1
-                );
+                let entities_components = (&entities, &stuff_storage, &external_storage)
+                    .join()
+                    .collect::<Vec<_>>();
+
+                assert_eq!(entities_components.len(), 1);
+                entities_components.into_iter().for_each(|(_, st, ex)| {
+                    assert_eq!(st.inner, "three");
+                    assert_eq!(ex.inner, 4);
+                });
             }
         );
     }

amethyst_error/Cargo.toml

@@ -19,4 +19,4 @@ repository = "https://github.com/amethyst/amethyst"
 travis-ci = { repository = "amethyst/amethyst" }
 
 [dependencies]
-backtrace = "0.3.13"
+backtrace = "0.3.44"

amethyst_gltf/Cargo.toml

@@ -20,10 +20,10 @@ amethyst_animation = { path = "../amethyst_animation/", version = "0.9.0" }
 amethyst_core = { path = "../amethyst_core/", version = "0.9.0" }
 amethyst_error = { path = "../amethyst_error/", version = "0.4.0" }
 amethyst_rendy = { path = "../amethyst_rendy", version = "0.4.0" }
-err-derive = "0.1"
+err-derive = "0.2"
 base64 = "0.11"
 fnv = "1"
-gltf = "0.14"
+gltf = "0.15"
 hibitset = { version = "0.6.2", features = ["parallel"] }
 itertools = "0.8"
 log = "0.4.6"
@@ -36,4 +36,3 @@ derivative = "1.0"
 
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
-nightly = [ "amethyst_core/nightly" ]

amethyst_gltf/src/format/animation.rs

@@ -120,6 +120,5 @@ where
         Linear => InterpolationFunction::Linear,
         Step => InterpolationFunction::Step,
         CubicSpline => InterpolationFunction::CubicSpline,
-        CatmullRomSpline => InterpolationFunction::CatmullRomSpline,
     }
 }

amethyst_gltf/src/format/importer.rs

@@ -156,13 +156,13 @@ pub fn get_image_data(
                 } else {
                     let mimetype = uri
                         .split(',')
-                        .nth(0)
+                        .next()
                         .expect("Unreachable: `split` will always return at least one element")
                         .split(':')
                         .nth(1)
                         .expect("URI does not contain ':'")
                         .split(';')
-                        .nth(0)
+                        .next()
                         .expect("Unreachable: `split` will always return at least one element");
                     Ok((data, ImageFormat::from_mime_type(mimetype)))
                 }