Update to edition 2021 on master (#3028)

Objective During work on #3009 I've found that not all jobs use actions-rs, and therefore, an previous version of Rust is used for them. So while compilation and other stuff can pass, checking markup and Android build may fail with compilation errors. Solution This PR adds `action-rs` for any job running cargo, and updates the edition to 2021.
bevyengine · Oct 27, 2021 · ffde86e · ffde86e
1 parent 6a8a8c9
commit ffde86e
Show file tree

Hide file tree

Showing 45 changed files with 71 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -125,6 +125,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
       - uses: actions/cache@v2
         with:
           path: |
@@ -255,6 +258,9 @@ jobs:
     if: always()
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
       - name: Install alsa and udev
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
         if: runner.os == 'linux'

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -23,6 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Check for security advisories and unmaintained crates
@@ -32,6 +36,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Check for banned and duplicated dependencies
@@ -41,6 +49,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Check for unauthorized licenses
@@ -50,6 +62,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
       - name: Install cargo-deny
         run: cargo install cargo-deny
       - name: Checked for unauthorized crate sources

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 categories = ["game-engines", "graphics", "gui", "rendering"]
 description = "A refreshingly simple data-driven game engine and app framework"
 exclude = ["assets/**/*", "tools/**/*", ".github/**/*", "crates/**/*"]

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "benches"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 criterion = "0.3"

diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_app"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides core App functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_asset"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides asset functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_audio"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides audio functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_core"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides core functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_derive"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides derive implementations for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_derive/src/enum_variant_meta.rs b/crates/bevy_derive/src/enum_variant_meta.rs
@@ -21,7 +21,7 @@ pub fn derive_enum_variant_meta(input: TokenStream) -> TokenStream {
     let indices = 0..names.len();
 
     TokenStream::from(quote! {
-        impl #impl_generics #bevy_util_path::EnumVariantMeta for #struct_name#ty_generics #where_clause {
+        impl #impl_generics #bevy_util_path::EnumVariantMeta for #struct_name #ty_generics #where_clause {
             fn enum_variant_index(&self) -> usize {
                 match self {
                     #(#struct_name::#idents {..} => #indices,)*

diff --git a/crates/bevy_derive/src/shader_defs.rs b/crates/bevy_derive/src/shader_defs.rs
@@ -40,7 +40,7 @@ pub fn derive_shader_defs(input: TokenStream) -> TokenStream {
     let (impl_generics, ty_generics, _where_clause) = generics.split_for_impl();
 
     TokenStream::from(quote! {
-        impl #impl_generics #bevy_render_path::shader::ShaderDefs for #struct_name#ty_generics {
+        impl #impl_generics #bevy_render_path::shader::ShaderDefs for #struct_name #ty_generics {
             fn shader_defs_len(&self) -> usize {
                 #shader_defs_len
             }

diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_diagnostic"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides diagnostic functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_dylib"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Force the Bevy Engine to be dynamically linked for faster linking"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_dynamic_plugin"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides dynamic plugin loading capabilities for non-wasm platforms"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_ecs"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Bevy Engine's entity component system"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_ecs/macros/Cargo.toml b/crates/bevy_ecs/macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bevy_ecs_macros"
 version = "0.5.0"
 description = "Bevy ECS Macros"
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [lib]

diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs
@@ -148,7 +148,7 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream {
 
     TokenStream::from(quote! {
         /// SAFE: ComponentId is returned in field-definition-order. [from_components] and [get_components] use field-definition-order
-        unsafe impl #impl_generics #ecs_path::bundle::Bundle for #struct_name#ty_generics #where_clause {
+        unsafe impl #impl_generics #ecs_path::bundle::Bundle for #struct_name #ty_generics #where_clause {
             fn component_ids(
                 components: &mut #ecs_path::component::Components,
                 storages: &mut #ecs_path::storage::Storages,
@@ -377,7 +377,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
     let fetch_struct_visibility = &ast.vis;
 
     TokenStream::from(quote! {
-        impl #impl_generics #path::system::SystemParam for #struct_name#ty_generics #where_clause {
+        impl #impl_generics #path::system::SystemParam for #struct_name #ty_generics #where_clause {
             type Fetch = #fetch_struct_name <(#(<#field_types as #path::system::SystemParam>::Fetch,)*), #punctuated_generic_idents>;
         }
 
@@ -410,7 +410,7 @@ pub fn derive_system_param(input: TokenStream) -> TokenStream {
         }
 
         impl #impl_generics #path::system::SystemParamFetch<'w, 's> for #fetch_struct_name <(#(<#field_types as #path::system::SystemParam>::Fetch,)*), #punctuated_generic_idents> {
-            type Item = #struct_name#ty_generics;
+            type Item = #struct_name #ty_generics;
             unsafe fn get_param(
                 state: &'s mut Self,
                 system_meta: &#path::system::SystemMeta,

diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_gilrs"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Gamepad system made using Gilrs for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_gltf"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Bevy Engine GLTF loading"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_input"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides input functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_internal"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "An internal Bevy crate used to facilitate optional dynamic linking via the 'dynamic' feature"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_log"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides logging for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_macro_utils/Cargo.toml b/crates/bevy_macro_utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_macro_utils"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "A collection of utils for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_math"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides math functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_pbr"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Adds PBR rendering to Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_reflect"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Dynamically interact with rust types"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_reflect_derive"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Derive implementations for bevy_reflect"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_reflect/bevy_reflect_derive/src/lib.rs b/crates/bevy_reflect/bevy_reflect_derive/src/lib.rs
@@ -206,7 +206,7 @@ fn impl_struct(
     TokenStream::from(quote! {
         #get_type_registration_impl
 
-        impl #impl_generics #bevy_reflect_path::Struct for #struct_name#ty_generics #where_clause {
+        impl #impl_generics #bevy_reflect_path::Struct for #struct_name #ty_generics #where_clause {
             fn field(&self, name: &str) -> Option<&dyn #bevy_reflect_path::Reflect> {
                 match name {
                     #(#field_names => Some(&self.#field_idents),)*
@@ -259,7 +259,7 @@ fn impl_struct(
         }
 
         // SAFE: any and any_mut both return self
-        unsafe impl #impl_generics #bevy_reflect_path::Reflect for #struct_name#ty_generics #where_clause {
+        unsafe impl #impl_generics #bevy_reflect_path::Reflect for #struct_name #ty_generics #where_clause {
             #[inline]
             fn type_name(&self) -> &str {
                 std::any::type_name::<Self>()
@@ -349,7 +349,7 @@ fn impl_tuple_struct(
     TokenStream::from(quote! {
         #get_type_registration_impl
 
-        impl #impl_generics #bevy_reflect_path::TupleStruct for #struct_name#ty_generics {
+        impl #impl_generics #bevy_reflect_path::TupleStruct for #struct_name #ty_generics {
             fn field(&self, index: usize) -> Option<&dyn #bevy_reflect_path::Reflect> {
                 match index {
                     #(#field_indices => Some(&self.#field_idents),)*
@@ -381,7 +381,7 @@ fn impl_tuple_struct(
         }
 
         // SAFE: any and any_mut both return self
-        unsafe impl #impl_generics #bevy_reflect_path::Reflect for #struct_name#ty_generics {
+        unsafe impl #impl_generics #bevy_reflect_path::Reflect for #struct_name #ty_generics {
             #[inline]
             fn type_name(&self) -> &str {
                 std::any::type_name::<Self>()
@@ -457,7 +457,7 @@ fn impl_value(
         #get_type_registration_impl
 
         // SAFE: any and any_mut both return self
-        unsafe impl #impl_generics #bevy_reflect_path::Reflect for #type_name#ty_generics #where_clause  {
+        unsafe impl #impl_generics #bevy_reflect_path::Reflect for #type_name #ty_generics #where_clause  {
             #[inline]
             fn type_name(&self) -> &str {
                 std::any::type_name::<Self>()
@@ -715,10 +715,10 @@ fn impl_get_type_registration(
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
     quote! {
         #[allow(unused_mut)]
-        impl #impl_generics #bevy_reflect_path::GetTypeRegistration for #type_name#ty_generics #where_clause {
+        impl #impl_generics #bevy_reflect_path::GetTypeRegistration for #type_name #ty_generics #where_clause {
             fn get_type_registration() -> #bevy_reflect_path::TypeRegistration {
-                let mut registration = #bevy_reflect_path::TypeRegistration::of::<#type_name#ty_generics>();
-                #(registration.insert::<#registration_data>(#bevy_reflect_path::FromType::<#type_name#ty_generics>::from_type());)*
+                let mut registration = #bevy_reflect_path::TypeRegistration::of::<#type_name #ty_generics>();
+                #(registration.insert::<#registration_data>(#bevy_reflect_path::FromType::<#type_name #ty_generics>::from_type());)*
                 registration
             }
         }

diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy_render"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 description = "Provides rendering functionality for Bevy Engine"
 homepage = "https://bevyengine.org"
 repository = "https://github.com/bevyengine/bevy"

diff --git a/crates/bevy_render/src/mesh/mesh/conversions.rs b/crates/bevy_render/src/mesh/mesh/conversions.rs
@@ -5,7 +5,6 @@
 //!
 //! ```rust
 //! use bevy_render::mesh::VertexAttributeValues;
-//! use std::convert::{ TryInto, TryFrom };
 //!
 //! // creating std::vec::Vec
 //! let buffer = vec![[0_u32; 4]; 10];
@@ -27,7 +26,6 @@
 
 use crate::mesh::VertexAttributeValues;
 use bevy_utils::EnumVariantMeta;
-use std::convert::TryFrom;
 use thiserror::Error;
 
 #[derive(Debug, Clone, Error)]
@@ -357,7 +355,6 @@ impl TryFrom<VertexAttributeValues> for Vec<f32> {
 #[cfg(test)]
 mod tests {
     use super::VertexAttributeValues;
-    use std::convert::{TryFrom, TryInto};
     #[test]
     fn f32() {
         let buffer = vec![0.0; 10];