Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 04:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update for edition 2021 (#2997)

Browse source 
# Objective

- update for Edition 2021

## Solution

- remove the `resolver = "2"`
- update for https://doc.rust-lang.org/edition-guide/rust-2021/reserving-syntax.html by adding a few ` `
This commit is contained in:
François 2021-10-25 18:00:13 +00:00
parent 432ce72faf
commit 2f4bcc5bf7
56 changed files with 83 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View file

@ -71,6 +71,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: Install Android targets
run: rustup target add aarch64-linux-android armv7-linux-androideabi
- name: Install Cargo APK
@ -145,6 +149,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- 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'
@ -155,7 +163,7 @@ jobs:
- name: Checks dead links
run: cargo deadlinks --dir target/doc/bevy
continue-on-error: true
check-missing-examples-in-docs:
runs-on: ubuntu-latest
steps:

16
.github/workflows/dependencies.yml vendored
View file

@ -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

3
Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
@ -14,7 +14,6 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/bevyengine/bevy"
resolver = "2"
[workspace]
exclude = ["benches"]

2
benches/Cargo.toml
View file

@ -5,7 +5,7 @@ authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
edition = "2018"
edition = "2021"
[dev-dependencies]
criterion = "0.3"

2
crates/bevy_app/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_app"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_asset/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_asset"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_audio/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_audio"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_core/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_core"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_core/src/lib.rs
View file

@ -43,7 +43,7 @@ impl Plugin for CorePlugin {
app.world
.get_resource::<DefaultTaskPoolOptions>()
.cloned()
.unwrap_or_else(DefaultTaskPoolOptions::default)
.unwrap_or_default()
.create_default_pools(&mut app.world);
app.init_resource::<Time>()

2
crates/bevy_derive/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_derive"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_derive/src/enum_variant_meta.rs
View file

@ -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,)*

2
crates/bevy_derive/src/resource.rs
View file

@ -21,7 +21,7 @@ pub fn derive_from_resources(input: TokenStream) -> TokenStream {
let struct_name = &ast.ident;
TokenStream::from(quote! {
impl #impl_generics #bevy_app_path::FromResources for #struct_name#ty_generics {
impl #impl_generics #bevy_app_path::FromResources for #struct_name #ty_generics {
fn from_resources(resources: &Resources) -> Self {
use #bevy_app_path::FromResources;
#struct_name {

2
crates/bevy_derive/src/shader_defs.rs
View file

@ -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
}

2
crates/bevy_diagnostic/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_diagnostic"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_dylib/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_dylib"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_dynamic_plugin/Cargo.toml
View file

@ -5,7 +5,7 @@ authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
edition = "2018"
edition = "2021"
description = "Provides dynamic plugin loading capabilities for non-wasm platforms"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"

2
crates/bevy_ecs/Cargo.toml
View file

@ -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"

2
crates/bevy_ecs/macros/Cargo.toml
View file

@ -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]

6
crates/bevy_ecs/macros/src/lib.rs
View file

@ -146,7 +146,7 @@ pub fn derive_bundle(input: TokenStream) -> TokenStream {
TokenStream::from(quote! {
/// SAFE: TypeInfo 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,
) -> Vec<#ecs_path::component::ComponentId> {
@ -374,7 +374,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>;
}
@ -407,7 +407,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,

2
crates/bevy_gilrs/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_gilrs"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
description = "Gamepad system made using Gilrs for Bevy Engine"
homepage = "https://bevyengine.org"

2
crates/bevy_gltf/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_gltf"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_input/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_input"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_internal/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_internal"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_log/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_log"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_macro_utils/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_macro_utils"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_math/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_math"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_pbr/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_pbr"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_reflect/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_reflect"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_reflect/bevy_reflect_derive/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_reflect_derive"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

20
crates/bevy_reflect/bevy_reflect_derive/src/lib.rs
View file

@ -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>()
@ -557,9 +557,7 @@ pub fn impl_reflect_value(input: TokenStream) -> TokenStream {
let bevy_reflect_path = BevyManifest::default().get_path("bevy_reflect");
let ty = &reflect_value_def.type_name;
let reflect_attrs = reflect_value_def
.attrs
.unwrap_or_else(ReflectAttrs::default);
let reflect_attrs = reflect_value_def.attrs.unwrap_or_default();
let registration_data = &reflect_attrs.data;
let get_type_registration_impl = impl_get_type_registration(
ty,
@ -717,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
}
}

2
crates/bevy_render/Cargo.toml
View file

@ -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"

3
crates/bevy_render/src/mesh/mesh/conversions.rs
View file

@ -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];

1
crates/bevy_render/src/render_graph/graph.rs
View file

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

1
crates/bevy_render/src/texture/image_texture_conversion.rs
View file

@ -1,4 +1,3 @@
use std::convert::TryFrom;
use thiserror::Error;
use super::{Extent3d, Texture, TextureDimension, TextureFormat};

2
crates/bevy_render/src/texture/texture.rs
View file

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

2
crates/bevy_scene/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_scene"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_sprite/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_sprite"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_tasks/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_tasks"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Lachlan Sneff <lachlan.sneff@gmail.com>",

2
crates/bevy_text/Cargo.toml
View file

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

2
crates/bevy_transform/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_transform"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_ui/Cargo.toml
View file

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

2
crates/bevy_utils/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_utils"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_wgpu/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_wgpu"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_wgpu/src/lib.rs
View file

@ -119,7 +119,7 @@ pub fn get_wgpu_render_system(world: &mut World) -> impl FnMut(&mut World) {
let options = world
.get_resource::<WgpuOptions>()
.cloned()
.unwrap_or_else(WgpuOptions::default);
.unwrap_or_default();
let mut wgpu_renderer = future::block_on(WgpuRenderer::new(options));
let resource_context = WgpuRenderResourceContext::new(wgpu_renderer.device.clone());

2
crates/bevy_window/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_window"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
crates/bevy_window/src/lib.rs
View file

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

2
crates/bevy_winit/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_winit"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
examples/ios/Cargo.toml
View file

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

2
pipelined/bevy_core_pipeline/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_core_pipeline"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
pipelined/bevy_gltf2/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_gltf2"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
pipelined/bevy_pbr2/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_pbr2"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
pipelined/bevy_render2/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_render2"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

3
pipelined/bevy_render2/src/mesh/mesh/conversions.rs
View file

@ -5,7 +5,6 @@
//!
//! ```rust
//! use bevy_render2::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];

1
pipelined/bevy_render2/src/render_graph/graph.rs
View file

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

2
pipelined/bevy_sprite2/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "bevy_sprite2"
version = "0.5.0"
edition = "2018"
edition = "2021"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",

2
tools/ci/Cargo.toml
View file

@ -5,7 +5,7 @@ authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Nathan Stocks <nathan@agileperception.com>"
]
edition = "2018"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html