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.
This commit is contained in:
Yoh Deadfall 2021-10-27 00:12:14 +00:00
parent 6a8a8c9d21
commit ffde86efa0
45 changed files with 71 additions and 55 deletions

View file

@ -125,6 +125,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
path: | path: |
@ -255,6 +258,9 @@ jobs:
if: always() if: always()
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
if: runner.os == 'linux' if: runner.os == 'linux'

View file

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

View file

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

View file

@ -1,7 +1,7 @@
[package] [package]
name = "benches" name = "benches"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
[dev-dependencies] [dev-dependencies]
criterion = "0.3" criterion = "0.3"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,7 +2,7 @@
name = "bevy_ecs_macros" name = "bevy_ecs_macros"
version = "0.5.0" version = "0.5.0"
description = "Bevy ECS Macros" description = "Bevy ECS Macros"
edition = "2018" edition = "2021"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[lib] [lib]

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -308,7 +308,6 @@ mod tests {
}; };
use bevy_ecs::world::World; use bevy_ecs::world::World;
use bevy_utils::HashSet; use bevy_utils::HashSet;
use std::iter::FromIterator;
#[derive(Debug)] #[derive(Debug)]
struct TestNode { struct TestNode {

View file

@ -1,5 +1,3 @@
use std::convert::TryInto;
use super::{Extent3d, SamplerDescriptor, TextureDescriptor, TextureDimension, TextureFormat}; use super::{Extent3d, SamplerDescriptor, TextureDescriptor, TextureDimension, TextureFormat};
use crate::renderer::{ use crate::renderer::{
RenderResource, RenderResourceContext, RenderResourceId, RenderResourceType, RenderResource, RenderResourceContext, RenderResourceId, RenderResourceType,

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_scene" name = "bevy_scene"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "Provides scene functionality for Bevy Engine" description = "Provides scene functionality for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_sprite" name = "bevy_sprite"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "Provides sprite functionality for Bevy Engine" description = "Provides sprite functionality for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_tasks" name = "bevy_tasks"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "A task executor for Bevy Engine" description = "A task executor for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_text" name = "bevy_text"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "Provides text functionality for Bevy Engine" description = "Provides text functionality for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_transform" name = "bevy_transform"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "Provides hierarchy and transform functionality for Bevy Engine" description = "Provides hierarchy and transform functionality for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_ui" name = "bevy_ui"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "A custom ECS-driven UI framework built specifically for Bevy Engine" description = "A custom ECS-driven UI framework built specifically for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

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

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_wgpu" name = "bevy_wgpu"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "A wgpu render backend for Bevy Engine" description = "A wgpu render backend for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_window" name = "bevy_window"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "Provides windowing functionality for Bevy Engine" description = "Provides windowing functionality for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -55,7 +55,7 @@ impl Plugin for WindowPlugin {
.world .world
.get_resource::<WindowDescriptor>() .get_resource::<WindowDescriptor>()
.map(|descriptor| (*descriptor).clone()) .map(|descriptor| (*descriptor).clone())
.unwrap_or_else(WindowDescriptor::default); .unwrap_or_default();
let mut create_window_event = app let mut create_window_event = app
.world .world
.get_resource_mut::<Events<CreateWindow>>() .get_resource_mut::<Events<CreateWindow>>()

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_winit" name = "bevy_winit"
version = "0.5.0" version = "0.5.0"
edition = "2018" edition = "2021"
description = "A winit window and input backend for Bevy Engine" description = "A winit window and input backend for Bevy Engine"
homepage = "https://bevyengine.org" homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy" repository = "https://github.com/bevyengine/bevy"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "bevy-ios-example" name = "bevy-ios-example"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
[lib] [lib]
name = "bevy_ios_example" name = "bevy_ios_example"

View file

@ -1,7 +1,7 @@
[package] [package]
name = "ci" name = "ci"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html