diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78deb9dcea..0fa9ead0ff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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:
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index 078c643d6e..619d2115a1 100644
--- 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
index 5a4dca68a0..2d68287a14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"]
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
index 3d13d202ef..6e2ff0a9a1 100644
--- a/benches/Cargo.toml
+++ b/benches/Cargo.toml
@@ -5,7 +5,7 @@ authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
 ]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 criterion = "0.3"
diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml
index 58e8ac243e..5d99e47200 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml
index a1fede4dfa..c4fee0cba8 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index e5d9b02163..d84f389e40 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml
index ef6283e890..a0b5539c2e 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs
index 50ab218cd6..e4c6f6de55 100644
--- a/crates/bevy_core/src/lib.rs
+++ b/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>()
diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml
index 2729d6f107..eacd576654 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_derive/src/enum_variant_meta.rs b/crates/bevy_derive/src/enum_variant_meta.rs
index 66ed1f0ff7..ae0c26d2ea 100644
--- 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/resource.rs b/crates/bevy_derive/src/resource.rs
index 110b5605ca..242f1ba230 100644
--- a/crates/bevy_derive/src/resource.rs
+++ b/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 {
diff --git a/crates/bevy_derive/src/shader_defs.rs b/crates/bevy_derive/src/shader_defs.rs
index 4596667b6a..c78f660404 100644
--- 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
index 83b234b01d..e16df10edf 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml
index cb424f6673..3d5c073ab1 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml
index 99589c7cc9..2749f84b7b 100644
--- a/crates/bevy_dynamic_plugin/Cargo.toml
+++ b/crates/bevy_dynamic_plugin/Cargo.toml
@@ -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"
diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml
index 00010a1525..1f65bb358a 100644
--- 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
index 78f882dead..69c988afa9 100644
--- 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
index 8371de3e4b..26579bb4be 100644
--- a/crates/bevy_ecs/macros/src/lib.rs
+++ b/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,
diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml
index e913abb9b9..dc3b21bcff 100644
--- 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"
 authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
 description = "Gamepad system made using Gilrs for Bevy Engine"
 homepage = "https://bevyengine.org"
diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml
index b94c04d664..767382dc9b 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml
index fdd442b612..d231ba12e9 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index 94a659cf68..f2df1808dc 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml
index 0dee0feab4..5ad3da9d91 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_macro_utils/Cargo.toml b/crates/bevy_macro_utils/Cargo.toml
index b92056f642..5f7adb6f3f 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml
index 109229b870..d195c6f1e8 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml
index 38f08920e9..71951fa397 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
index 1f0e81e050..9fb4c4ca1f 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml
index 1836607e1b..8427d26c1d 100644
--- 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"
 authors = [
     "Bevy Contributors <bevyengine@gmail.com>",
     "Carter Anderson <mcanders1@gmail.com>",
diff --git a/crates/bevy_reflect/bevy_reflect_derive/src/lib.rs b/crates/bevy_reflect/bevy_reflect_derive/src/lib.rs
index 0066f5a10d..45d40b0ff0 100644
--- 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>()
@@ -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
             }
         }
diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml
index c18b6ed307..1752c34d68 100644
--- 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
index 51170afc2b..e62932c8c1 100644
--- 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];
diff --git a/crates/bevy_render/src/render_graph/graph.rs b/crates/bevy_render/src/render_graph/graph.rs
index 503bce7578..b820877818 100644
--- a/crates/bevy_render/src/render_graph/graph.rs
+++ b/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 {
diff --git a/crates/bevy_render/src/texture/image_texture_conversion.rs b/crates/bevy_render/src/texture/image_texture_conversion.rs
index dc31be26d5..27bfab9df6 100644
--- a/crates/bevy_render/src/texture/image_texture_conversion.rs
+++ b/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};
diff --git a/crates/bevy_render/src/texture/texture.rs b/crates/bevy_render/src/texture/texture.rs
index 2a349a0fd0..6ef80ed4cf 100644
--- a/crates/bevy_render/src/texture/texture.rs
+++ b/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,
diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml
index 3c555b2a8e..0711c63745 100644
--- a/crates/bevy_scene/Cargo.toml
+++ b/crates/bevy_scene/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml
index 13689a1686..ca37ce6fdd 100644
--- a/crates/bevy_sprite/Cargo.toml
+++ b/crates/bevy_sprite/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_tasks/Cargo.toml b/crates/bevy_tasks/Cargo.toml
index 876d1482c9..c7090c337f 100644
--- a/crates/bevy_tasks/Cargo.toml
+++ b/crates/bevy_tasks/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml
index f4be2c9a85..613e50f93b 100644
--- a/crates/bevy_text/Cargo.toml
+++ b/crates/bevy_text/Cargo.toml
@@ -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"
diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml
index eec5f36215..ad93b045b1 100644
--- a/crates/bevy_transform/Cargo.toml
+++ b/crates/bevy_transform/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml
index 07e653d834..07f23d03da 100644
--- a/crates/bevy_ui/Cargo.toml
+++ b/crates/bevy_ui/Cargo.toml
@@ -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"
diff --git a/crates/bevy_utils/Cargo.toml b/crates/bevy_utils/Cargo.toml
index d98ab41e6c..f8c1115e72 100644
--- a/crates/bevy_utils/Cargo.toml
+++ b/crates/bevy_utils/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_wgpu/Cargo.toml b/crates/bevy_wgpu/Cargo.toml
index b2f240b560..9969b1869d 100644
--- a/crates/bevy_wgpu/Cargo.toml
+++ b/crates/bevy_wgpu/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_wgpu/src/lib.rs b/crates/bevy_wgpu/src/lib.rs
index e345fe2e7c..d515b45d2d 100644
--- a/crates/bevy_wgpu/src/lib.rs
+++ b/crates/bevy_wgpu/src/lib.rs
@@ -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());
diff --git a/crates/bevy_window/Cargo.toml b/crates/bevy_window/Cargo.toml
index ac2617feb1..4eb4fcbbfb 100644
--- a/crates/bevy_window/Cargo.toml
+++ b/crates/bevy_window/Cargo.toml
@@ -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>",
diff --git a/crates/bevy_window/src/lib.rs b/crates/bevy_window/src/lib.rs
index 00826777cc..946415eac5 100644
--- a/crates/bevy_window/src/lib.rs
+++ b/crates/bevy_window/src/lib.rs
@@ -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>>()
diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml
index 53e6400871..ce02180ad6 100644
--- a/crates/bevy_winit/Cargo.toml
+++ b/crates/bevy_winit/Cargo.toml
@@ -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>",
diff --git a/examples/ios/Cargo.toml b/examples/ios/Cargo.toml
index 06a9baa583..8159df555e 100644
--- a/examples/ios/Cargo.toml
+++ b/examples/ios/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bevy-ios-example"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "bevy_ios_example"
diff --git a/pipelined/bevy_core_pipeline/Cargo.toml b/pipelined/bevy_core_pipeline/Cargo.toml
index 4f4ac0e2fe..35dec39023 100644
--- a/pipelined/bevy_core_pipeline/Cargo.toml
+++ b/pipelined/bevy_core_pipeline/Cargo.toml
@@ -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>",
diff --git a/pipelined/bevy_gltf2/Cargo.toml b/pipelined/bevy_gltf2/Cargo.toml
index a5efe4753b..080d004334 100644
--- a/pipelined/bevy_gltf2/Cargo.toml
+++ b/pipelined/bevy_gltf2/Cargo.toml
@@ -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>",
diff --git a/pipelined/bevy_pbr2/Cargo.toml b/pipelined/bevy_pbr2/Cargo.toml
index 21bf192169..ea1a538c00 100644
--- a/pipelined/bevy_pbr2/Cargo.toml
+++ b/pipelined/bevy_pbr2/Cargo.toml
@@ -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>",
diff --git a/pipelined/bevy_render2/Cargo.toml b/pipelined/bevy_render2/Cargo.toml
index a1bb1fbc66..694b500e3d 100644
--- a/pipelined/bevy_render2/Cargo.toml
+++ b/pipelined/bevy_render2/Cargo.toml
@@ -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>",
diff --git a/pipelined/bevy_render2/src/mesh/mesh/conversions.rs b/pipelined/bevy_render2/src/mesh/mesh/conversions.rs
index 79b88498a8..b9c9d99dec 100644
--- a/pipelined/bevy_render2/src/mesh/mesh/conversions.rs
+++ b/pipelined/bevy_render2/src/mesh/mesh/conversions.rs
@@ -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];
diff --git a/pipelined/bevy_render2/src/render_graph/graph.rs b/pipelined/bevy_render2/src/render_graph/graph.rs
index 23d6c40932..8a68c54ab2 100644
--- a/pipelined/bevy_render2/src/render_graph/graph.rs
+++ b/pipelined/bevy_render2/src/render_graph/graph.rs
@@ -364,7 +364,6 @@ mod tests {
     };
     use bevy_ecs::world::World;
     use bevy_utils::HashSet;
-    use std::iter::FromIterator;
 
     #[derive(Debug)]
     struct TestNode {
diff --git a/pipelined/bevy_sprite2/Cargo.toml b/pipelined/bevy_sprite2/Cargo.toml
index 3a1a3fd9cc..8f5f81d52e 100644
--- a/pipelined/bevy_sprite2/Cargo.toml
+++ b/pipelined/bevy_sprite2/Cargo.toml
@@ -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>",
diff --git a/tools/ci/Cargo.toml b/tools/ci/Cargo.toml
index cea60163c5..f8ccbb5bb1 100644
--- a/tools/ci/Cargo.toml
+++ b/tools/ci/Cargo.toml
@@ -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