Try #2997:

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
   "Bevy Contributors <[email protected]>",
   "Carter Anderson <[email protected]>",
@@ -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"]

benches/Cargo.toml

@@ -5,7 +5,7 @@ authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",
 ]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 criterion = "0.3"

crates/bevy_app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_app"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_asset/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_asset"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_audio/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_audio"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_core"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_core/src/lib.rs

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

crates/bevy_derive/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_derive"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

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

crates/bevy_derive/src/resource.rs

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

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
             }

crates/bevy_diagnostic/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_diagnostic"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_dylib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_dylib"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_dynamic_plugin/Cargo.toml

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

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"

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]

crates/bevy_ecs/macros/src/lib.rs

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

crates/bevy_gilrs/Cargo.toml

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

crates/bevy_gltf/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_gltf"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_input/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_input"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_internal/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_internal"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_log/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_log"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_macro_utils/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_macro_utils"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_math/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_math"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_pbr/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_pbr"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

crates/bevy_reflect/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_reflect"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

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"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",

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

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"

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

crates/bevy_render/src/render_graph/graph.rs

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

crates/bevy_render/src/texture/image_texture_conversion.rs

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

crates/bevy_render/src/texture/texture.rs

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

crates/bevy_scene/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_scene"
 version = "0.5.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Bevy Contributors <[email protected]>",
     "Carter Anderson <[email protected]>",