2018 migration

Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst"
 version = "0.9.0"
 authors = ["Eyal Kalderon <[email protected]>"]
+edition = "2018"
 description = "Data-oriented game engine written in Rust"
 exclude = ["examples/*", "book/*"]
 keywords = ["game", "engine", "sdk", "amethyst"]

amethyst_animation/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_animation"
 version = "0.4.0"
 authors = ["Simon Rönnberg <[email protected]>"]
+edition = "2018"
 description = "Animation support for Amethyst"
 keywords = ["game", "engine", "animation", "3d", "amethyst"]
 

amethyst_animation/src/lib.rs

@@ -47,20 +47,20 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_assets;
-extern crate amethyst_core;
+
+
 #[macro_use]
 extern crate amethyst_derive;
-extern crate amethyst_renderer;
+
 #[macro_use]
 extern crate derivative;
-extern crate fnv;
-extern crate hibitset;
-extern crate itertools;
+
+
+
 #[macro_use]
 extern crate log;
-extern crate minterpolate;
-extern crate num_traits;
+
+
 #[macro_use]
 extern crate serde;
 

amethyst_animation/src/skinning/systems.rs

@@ -98,7 +98,7 @@ impl<'a> System<'a> for VertexSkinningSystem {
             }
         }
 
-        for (_, mesh_global, mut joint_transform) in
+        for (_, mesh_global, joint_transform) in
             (&self.updated, &global_transforms, &mut matrices).join()
         {
             if let Some(global_inverse) = mesh_global.0.try_inverse() {

amethyst_assets/Cargo.toml

@@ -3,6 +3,7 @@ name = "amethyst_assets"
 version = "0.5.0"
 authors = ["torkleyy <[email protected]>"]
 readme = "README.md"
+edition = "2018"
 description = """
 Asynchronous asset management for games.
 """

amethyst_assets/examples/ll.rs

@@ -1,8 +1,8 @@
 //! Defining a custom asset and format.
 
-extern crate amethyst_assets;
-extern crate amethyst_core;
-extern crate rayon;
+
+
+
 
 use std::{str::from_utf8, sync::Arc, thread::sleep, time::Duration};
 
@@ -30,7 +30,7 @@ impl Format<DummyAsset> for DummyFormat {
     fn import(
         &self,
         name: String,
-        source: Arc<Source>,
+        source: Arc<dyn Source>,
         _: (),
         _create_reload: bool,
     ) -> Result<FormatValue<DummyAsset>> {

amethyst_assets/src/lib.rs

@@ -9,24 +9,24 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_core;
-extern crate crossbeam;
+use amethyst_core;
+
 #[macro_use]
 extern crate derivative;
 #[macro_use]
 extern crate error_chain;
-extern crate fnv;
-extern crate hibitset;
+
+
 #[macro_use]
 extern crate log;
-extern crate parking_lot;
-extern crate rayon;
-extern crate ron;
+
+
+
 #[macro_use]
 extern crate serde;
 #[cfg(feature = "json")]
 extern crate serde_json;
-extern crate shred;
+use shred;
 #[macro_use]
 extern crate shred_derive;
 

amethyst_audio/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_audio"
 version = "0.4.0"
 authors = ["Xaeroxe <[email protected]>"]
+edition = "2018"
 description = "Audio support for Amethyst"
 exclude = ["examples/*"]
 keywords = ["game", "engine", "audio","amethyst"]

amethyst_audio/src/lib.rs

@@ -1,15 +1,15 @@
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
 //! Loading and playing of audio files.
-extern crate amethyst_assets;
-extern crate amethyst_core;
-extern crate cpal;
+
+
+
 #[macro_use]
 extern crate log;
-extern crate rodio;
+
 #[macro_use]
 extern crate serde;
-extern crate smallvec;
+
 
 #[macro_use]
 #[cfg(feature = "profiler")]

amethyst_config/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_config"
 version = "0.8.0"
 authors = ["Aceeri <[email protected]>"]
+edition = "2018"
 description = "Loading from .ron files into Rust structures with defaults to prevent hard errors."
 exclude = ["examples/*"]
 

amethyst_config/examples/main.rs

@@ -1,4 +1,4 @@
-extern crate amethyst_config;
+
 #[macro_use]
 extern crate serde_derive;
 

amethyst_config/src/lib.rs

@@ -7,8 +7,8 @@
 
 #[macro_use]
 extern crate log;
-extern crate ron;
-extern crate serde;
+use ron;
+
 
 use std::{
     error::Error,

amethyst_controls/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_controls"
 version = "0.3.0"
 authors = ["Joël Lupien <[email protected]>"]
+edition = "2018"
 description = "Amethyst controls"
 
 documentation = "https://www.amethyst.rs/doc/master/doc/amethyst_controls/"

amethyst_controls/src/lib.rs

@@ -2,13 +2,13 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_assets;
-extern crate amethyst_core;
-extern crate amethyst_input;
-extern crate amethyst_renderer;
+
+use amethyst_core;
+
+
 #[macro_use]
 extern crate serde;
-extern crate winit;
+
 
 mod bundles;
 mod components;

amethyst_core/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_core"
 version = "0.4.0"
 authors = ["Simon Rönnberg <[email protected]>"]
+edition = "2018"
 description = "Amethyst core"
 
 documentation = "https://www.amethyst.rs/doc/master/doc/amethyst_core/"

amethyst_core/src/lib.rs

@@ -2,19 +2,19 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-pub extern crate approx;
-pub extern crate nalgebra;
-pub extern crate shred;
-pub extern crate shrev;
-pub extern crate specs;
+pub use approx;
+pub use nalgebra;
+pub use shred;
+pub use shrev;
+pub use specs;
 
 #[macro_use]
 extern crate error_chain;
-extern crate hibitset;
-extern crate rayon;
+
+use rayon;
 #[macro_use]
 extern crate serde;
-extern crate specs_hierarchy;
+
 
 #[macro_use]
 #[cfg(feature = "profiler")]

amethyst_derive/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_derive"
 version = "0.2.0"
 authors = ["Simon Rönnberg <[email protected]>"]
+edition = "2018"
 description = "Amethyst derive"
 
 documentation = "https://www.amethyst.rs/doc/master/doc/amethyst_derive/"

amethyst_derive/src/lib.rs

@@ -2,7 +2,7 @@
 #![warn(rust_2018_idioms, rust_2018_compatibility)]
 
 extern crate proc_macro;
-extern crate proc_macro2;
+
 #[macro_use]
 extern crate syn;
 #[macro_use]

amethyst_derive/tests/test.rs

@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate amethyst_derive;
-extern crate amethyst_assets;
-extern crate amethyst_core;
+
+
 
 use amethyst_assets::{PrefabData, PrefabError, ProgressCounter};
 use amethyst_core::{

amethyst_gltf/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_gltf"
 version = "0.4.0"
 authors = ["Rhuagh <[email protected]>"]
+edition = "2018"
 description = "GLTF asset loading"
 
 documentation = "https://www.amethyst.rs/doc/master/doc/amethyst_gltf/"

amethyst_gltf/src/format/mesh.rs

@@ -37,7 +37,7 @@ pub fn load_mesh(
             });
 
         trace!("Loading positions");
-        let mut positions = reader
+        let positions = reader
             .read_positions()
             .map(|positions| match faces {
                 Some(ref faces) => {

amethyst_gltf/src/lib.rs

@@ -2,17 +2,17 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_animation as animation;
-extern crate amethyst_assets as assets;
-extern crate amethyst_core as core;
-extern crate amethyst_renderer as renderer;
-extern crate base64;
-extern crate gfx;
-extern crate gltf;
-extern crate itertools;
+use amethyst_animation as animation;
+use amethyst_assets as assets;
+use amethyst_core as core;
+use amethyst_renderer as renderer;
+use base64;
+
+use gltf;
+
 #[macro_use]
 extern crate log;
-extern crate mikktspace;
+use mikktspace;
 #[macro_use]
 extern crate serde;
 
@@ -271,7 +271,7 @@ impl<'a> PrefabData<'a> for GltfPrefab {
         let mut ret = false;
         if let Some(ref mut mats) = self.materials {
             mat_set.materials.clear();
-            for (id, mut material) in mats.materials.iter_mut() {
+            for (id, material) in mats.materials.iter_mut() {
                 if material.load_sub_assets(progress, materials)? {
                     ret = true;
                 }

amethyst_input/Cargo.toml

@@ -2,6 +2,7 @@
 name = "amethyst_input"
 version = "0.5.0"
 authors = ["Rhuagh <[email protected]>", "Xaeroxe <[email protected]>"]
+edition = "2018"
 description = "Input rebinding "
 
 documentation = "https://www.amethyst.rs/doc/master/doc/amethyst_input/"

amethyst_input/src/lib.rs

@@ -2,16 +2,16 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_config;
-extern crate amethyst_core;
-extern crate amethyst_renderer;
+
+use amethyst_core;
+
 #[macro_use]
 extern crate derivative;
-extern crate fnv;
+
 #[macro_use]
 extern crate serde;
-extern crate smallvec;
-extern crate winit;
+use smallvec;
+use winit;
 
 #[cfg(feature = "sdl_controller")]
 extern crate sdl2;

amethyst_locale/Cargo.toml

@@ -3,6 +3,7 @@ name = "amethyst_locale"
 version = "0.3.0"
 authors = ["Joël Lupien <[email protected]>"]
 readme = "README.md"
+edition = "2018"
 description = """
 Localisation bindings.
 """

amethyst_locale/src/lib.rs

@@ -3,9 +3,9 @@
 //! Localisation binding a `Fluent` file to an Asset<Locale> via the use of amethyst_assets.
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_assets;
-extern crate amethyst_core;
-extern crate fluent;
+
+
+
 
 use fluent::bundle::FluentBundle;
 

amethyst_network/Cargo.toml

@@ -5,6 +5,7 @@ authors = [
 	"Joël Lupien (Jojolepro) <[email protected]>",
 	"Lucio Franco (LucioFranco) <[email protected]>"
 ]
+edition = "2018"
 description = "Amethyst networking crate"
 keywords = ["networking", "specs", "ecs", "amethyst", "serialization"]
 categories = ["game-engines"]

amethyst_network/src/lib.rs

@@ -2,15 +2,15 @@
 
 #![warn(missing_docs, rust_2018_idioms, rust_2018_compatibility)]
 
-extern crate amethyst_core;
+
 #[macro_use]
 extern crate log;
 #[macro_use]
 extern crate serde;
-extern crate bincode;
-extern crate laminar;
-extern crate shrev;
-extern crate uuid;
+
+
+
+
 
 mod bundle;
 mod connection;