cargo fmt

Cargo.toml

@@ -23,6 +23,12 @@ wgpu = ["bevy_wgpu"]
 winit = ["bevy_winit"]
 more-system-fns = ["legion/more-system-fns"]
 
+[workspace]
+members = [
+    "crates/*",
+    "examples/app/dynamic_plugin_loading/example_plugin"
+]
+
 [dependencies]
 # bevy
 bevy_app = { path = "crates/bevy_app" }
@@ -45,12 +51,6 @@ glam = { path = "crates/bevy_glam" }
 # other
 log = { version = "0.4", features = ["release_max_level_info"] }
 
-[workspace]
-members = [
-    "crates/*",
-    "examples/app/dynamic_plugin_loading/example_plugin"
-]
-
 [dev-dependencies]
 rand = "0.7.2"
 serde = { version = "1", features = ["derive"]}

crates/bevy_app/src/app_builder.rs

@@ -151,10 +151,7 @@ impl AppBuilder {
         self
     }
 
-    pub fn init_startup_system<T>(
-        &mut self,
-        build: impl FnMut(&mut Resources) -> T,
-    ) -> &mut Self
+    pub fn init_startup_system<T>(&mut self, build: impl FnMut(&mut Resources) -> T) -> &mut Self
     where
         T: Into<System>,
     {

crates/bevy_app/src/schedule_runner.rs

@@ -28,7 +28,9 @@ impl ScheduleRunnerPlugin {
 
     pub fn run_loop(wait_duration: Duration) -> Self {
         ScheduleRunnerPlugin {
-            run_mode: RunMode::Loop { wait: Some(wait_duration) },
+            run_mode: RunMode::Loop {
+                wait: Some(wait_duration),
+            },
         }
     }
 }

crates/bevy_asset/src/handle.rs

@@ -8,7 +8,8 @@ use uuid::Uuid;
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
 pub struct HandleId(pub Uuid);
-pub const DEFAULT_HANDLE_ID: HandleId = HandleId(Uuid::from_u128(240940089166493627844978703213080810552));
+pub const DEFAULT_HANDLE_ID: HandleId =
+    HandleId(Uuid::from_u128(240940089166493627844978703213080810552));
 
 impl HandleId {
     pub fn new() -> HandleId {

crates/bevy_core/src/bytes.rs

@@ -1,4 +1,4 @@
-use glam::{Mat4, Vec4, Vec3, Vec2};
+use glam::{Mat4, Vec2, Vec3, Vec4};
 use zerocopy::AsBytes;
 
 pub trait GetBytes {
@@ -64,7 +64,6 @@ impl GetBytes for Vec2 {
     }
 }
 
-
 impl GetBytes for Vec4 {
     fn get_bytes(&self) -> Vec<u8> {
         let vec4_array: [f32; 4] = (*self).into();

crates/bevy_derive/src/lib.rs

@@ -2,9 +2,9 @@ extern crate proc_macro;
 
 mod modules;
 
-use modules::{get_modules, get_path};
 use darling::FromMeta;
 use inflector::Inflector;
+use modules::{get_modules, get_path};
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
 use syn::{parse_macro_input, Data, DataStruct, DeriveInput, Field, Fields, Ident, Path, Type};

crates/bevy_diagnostic/src/lib.rs

@@ -1,7 +1,6 @@
 mod diagnostic;
-mod print_diagnostics_plugin;
 mod frame_time_diagnostics_plugin;
-pub use diagnostic::*;
+mod print_diagnostics_plugin;
 pub use diagnostic::*;
 pub use frame_time_diagnostics_plugin::FrameTimeDiagnosticsPlugin;
 pub use print_diagnostics_plugin::PrintDiagnosticsPlugin;

crates/bevy_glam/src/f32/glam_zerocopy.rs

@@ -1,100 +1,114 @@
-use zerocopy::{FromBytes, AsBytes};
-use crate::{Vec2, Vec3, Vec4, Mat2, Mat3, Mat4, Quat};
+use crate::{Mat2, Mat3, Mat4, Quat, Vec2, Vec3, Vec4};
+use zerocopy::{AsBytes, FromBytes};
 
 unsafe impl AsBytes for Vec2 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Vec2 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl AsBytes for Vec3 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Vec3 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl AsBytes for Vec4 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Vec4 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl AsBytes for Mat2 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Mat2 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl AsBytes for Mat3 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Mat3 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl AsBytes for Mat4 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Mat4 {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl AsBytes for Quat {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }
 
 unsafe impl FromBytes for Quat {
     fn only_derive_is_allowed_to_implement_this_trait()
     where
-        Self: Sized {}
-    
+        Self: Sized,
+    {
+    }
 }

crates/bevy_glam/tests/vec2.rs

@@ -345,9 +345,10 @@ fn test_vec2mask_eq() {
 
 #[test]
 fn test_vec2mask_hash() {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::Hash;
-    use std::hash::Hasher;
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
 
     let a = Vec2Mask::new(true, false);
     let b = Vec2Mask::new(true, false);

crates/bevy_glam/tests/vec3.rs

@@ -449,9 +449,10 @@ fn test_vec3mask_eq() {
 
 #[test]
 fn test_vec3mask_hash() {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::Hash;
-    use std::hash::Hasher;
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
 
     let a = Vec3Mask::new(true, false, true);
     let b = Vec3Mask::new(true, false, true);

crates/bevy_glam/tests/vec4.rs

@@ -494,9 +494,10 @@ fn test_vec4mask_eq() {
 
 #[test]
 fn test_vec4mask_hash() {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::Hash;
-    use std::hash::Hasher;
+    use std::{
+        collections::hash_map::DefaultHasher,
+        hash::{Hash, Hasher},
+    };
 
     let a = Vec4Mask::new(true, false, true, false);
     let b = Vec4Mask::new(true, false, true, false);

crates/bevy_pbr/src/nodes/lights_node.rs

@@ -1,7 +1,7 @@
 use bevy_render::{
     render_graph::{CommandQueue, Node, ResourceSlots, SystemNode},
     render_resource::{resource_name, BufferInfo, BufferUsage, RenderResourceAssignments},
-    renderer::{RenderResources, RenderContext},
+    renderer::{RenderContext, RenderResources},
 };
 
 use crate::light::{Light, LightRaw};

crates/bevy_render/src/base_render_graph/mod.rs

@@ -4,10 +4,7 @@ use crate::{
         RenderPassDepthStencilAttachmentDescriptor, StoreOp, TextureAttachment,
     },
     render_graph::{
-        nodes::{
-            Camera2dNode, CameraNode, PassNode, WindowSwapChainNode,
-            WindowTextureNode,
-        },
+        nodes::{Camera2dNode, CameraNode, PassNode, WindowSwapChainNode, WindowTextureNode},
         RenderGraph,
     },
     texture::{Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsage},
@@ -18,10 +15,10 @@ use bevy_window::{WindowCreated, WindowReference, WindowResized};
 use legion::prelude::Resources;
 
 pub struct BaseRenderGraphConfig {
-    add_2d_camera: bool,
-    add_3d_camera: bool,
-    add_main_pass: bool,
-    connect_main_pass_to_swapchain: bool,
+    pub add_2d_camera: bool,
+    pub add_3d_camera: bool,
+    pub add_main_pass: bool,
+    pub connect_main_pass_to_swapchain: bool,
 }
 
 pub mod node {
@@ -129,7 +126,6 @@ impl BaseRenderGraphBuilder for RenderGraph {
             }
         }
 
-
         self.add_node_named(
             node::PRIMARY_SWAP_CHAIN,
             WindowSwapChainNode::new(

crates/bevy_render/src/batch/batcher.rs

@@ -154,7 +154,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::{Batch, BatchKey, Batcher};
-    use bevy_asset::{Handle, HandleUntyped, HandleId};
+    use bevy_asset::{Handle, HandleId, HandleUntyped};
 
     #[derive(Debug, Eq, PartialEq)]
     struct A;

crates/bevy_render/src/draw_target/draw_targets/assigned_meshes_draw_target.rs

@@ -101,7 +101,9 @@ impl DrawTarget for AssignedMeshesDrawTarget {
             pipeline_assignments.assignments.get(&pipeline_handle);
         let global_render_resource_assignments =
             resources.get::<RenderResourceAssignments>().unwrap();
-        render_context.resources().setup_bind_groups(pipeline_descriptor, &global_render_resource_assignments);
+        render_context
+            .resources()
+            .setup_bind_groups(pipeline_descriptor, &global_render_resource_assignments);
         if let Some(assigned_render_resource_assignments) = assigned_render_resource_assignments {
             for assignment_id in assigned_render_resource_assignments.iter() {
                 let entity = entity_render_resource_assignments

crates/bevy_render/src/mesh.rs

@@ -4,7 +4,7 @@ use crate::{
         VertexBufferDescriptor, VertexBufferDescriptors, VertexFormat,
     },
     render_resource::{BufferInfo, BufferUsage, RenderResourceAssignments},
-    renderer::{RenderResources, RenderResourceContext},
+    renderer::{RenderResourceContext, RenderResources},
     shader::AsUniforms,
     Renderable, Vertex,
 };
@@ -384,7 +384,7 @@ pub fn mesh_resource_provider_system(resources: &mut Resources) -> Box<dyn Sched
         .read_resource::<AssetStorage<Mesh>>()
         .with_query(<(Read<Handle<Mesh>>, Write<Renderable>)>::query())
         .build(
-            move |_, world, (render_resource_context, meshes,/* asset_batchers*/), query| {
+            move |_, world, (render_resource_context, meshes /* asset_batchers*/), query| {
                 let render_resources = &*render_resource_context.context;
                 // TODO: remove this once batches are pipeline specific and deprecate assigned_meshes draw target
                 for (handle, mut renderable) in query.iter_mut(world) {

crates/bevy_render/src/pipeline/pipeline_compiler.rs

@@ -6,7 +6,7 @@ use crate::{
     render_resource::{
         BufferInfo, RenderResourceAssignments, RenderResourceAssignmentsId, ResourceInfo,
     },
-    renderer::{RenderResources, RenderResourceContext},
+    renderer::{RenderResourceContext, RenderResources},
     shader::{Shader, ShaderSource},
     Renderable,
 };
@@ -289,8 +289,7 @@ pub fn update_shader_assignments(world: &mut World, resources: &Resources) {
         let mut pipeline_compiler = resources.get_mut::<PipelineCompiler>().unwrap();
         let mut shader_storage = resources.get_mut::<AssetStorage<Shader>>().unwrap();
         let vertex_buffer_descriptors = resources.get::<VertexBufferDescriptors>().unwrap();
-        let render_resources =
-            resources.get::<RenderResources>().unwrap();
+        let render_resources = resources.get::<RenderResources>().unwrap();
         let mut pipeline_descriptor_storage = resources
             .get_mut::<AssetStorage<PipelineDescriptor>>()
             .unwrap();

crates/bevy_render/src/render_graph/command.rs

@@ -1,6 +1,7 @@
 use crate::{render_resource::RenderResource, renderer::RenderContext, texture::Extent3d};
 use std::sync::{Arc, Mutex};
 
+#[derive(Clone, Debug)]
 pub enum Command {
     CopyBufferToBuffer {
         source_buffer: RenderResource,

crates/bevy_render/src/render_graph/nodes/camera2d_node.rs

@@ -5,7 +5,7 @@ use crate::{
     camera::{ActiveCamera2d, Camera},
     render_graph::{CommandQueue, Node, ResourceSlots, SystemNode},
     render_resource::{resource_name, BufferInfo, BufferUsage, RenderResourceAssignments},
-    renderer::{RenderResources, RenderContext},
+    renderer::{RenderContext, RenderResources},
 };
 
 use legion::prelude::*;

crates/bevy_render/src/render_graph/nodes/camera_node.rs

@@ -1,7 +1,7 @@
 use crate::{
     render_graph::{CommandQueue, Node, ResourceSlots, SystemNode},
     render_resource::{resource_name, BufferInfo, BufferUsage, RenderResourceAssignments},
-    renderer::{RenderResources, RenderContext},
+    renderer::{RenderContext, RenderResources},
     ActiveCamera, Camera,
 };
 

crates/bevy_render/src/render_graph/nodes/uniform_node.rs

@@ -5,7 +5,7 @@ use crate::{
         BufferArrayInfo, BufferInfo, BufferUsage, RenderResource, RenderResourceAssignments,
         RenderResourceAssignmentsId, ResourceInfo,
     },
-    renderer::{RenderResources, RenderContext, RenderResourceContext},
+    renderer::{RenderContext, RenderResourceContext, RenderResources},
     shader::{AsUniforms, FieldBindType},
     texture, Renderable,
 };

crates/bevy_render/src/renderer/mod.rs

@@ -1,7 +1,7 @@
+mod headless_render_resource_context;
 mod render_context;
 mod render_resource_context;
-mod headless_render_resource_context;
 
+pub use headless_render_resource_context::*;
 pub use render_context::*;
 pub use render_resource_context::*;
-pub use headless_render_resource_context::*;

crates/bevy_render/src/renderer/render_resource_context.rs

@@ -1,7 +1,10 @@
 use crate::{
-    render_resource::{BufferInfo, RenderResource, ResourceInfo, RenderResourceAssignments, RenderResourceSetId},
+    pipeline::{BindGroupDescriptor, PipelineDescriptor},
+    render_resource::{
+        BufferInfo, RenderResource, RenderResourceAssignments, RenderResourceSetId, ResourceInfo,
+    },
     shader::Shader,
-    texture::{SamplerDescriptor, TextureDescriptor}, pipeline::{BindGroupDescriptor, PipelineDescriptor},
+    texture::{SamplerDescriptor, TextureDescriptor},
 };
 use bevy_asset::{AssetStorage, Handle, HandleUntyped};
 use bevy_window::{Window, WindowId};

crates/bevy_render/src/shader/shader.rs

@@ -1,8 +1,7 @@
 use super::ShaderLayout;
 use bevy_asset::Handle;
-use std::marker::Copy;
 use glsl_to_spirv::compile;
-use std::io::Read;
+use std::{io::Read, marker::Copy};
 #[derive(Hash, Eq, PartialEq, Copy, Clone, Debug)]
 pub enum ShaderStage {
     Vertex,
@@ -31,7 +30,9 @@ pub fn glsl_to_spirv(
 
     let mut spv_words = Vec::new();
     for bytes4 in spv_bytes.chunks(4) {
-        spv_words.push(u32::from_le_bytes([bytes4[0], bytes4[1], bytes4[2], bytes4[3]]));
+        spv_words.push(u32::from_le_bytes([
+            bytes4[0], bytes4[1], bytes4[2], bytes4[3],
+        ]));
     }
     spv_words
 }

crates/bevy_ui/src/entity.rs

@@ -1,5 +1,5 @@
 use super::Node;
-use crate::{render::UI_PIPELINE_HANDLE, ColorMaterial, Rect, QUAD_HANDLE, sprite::Sprite};
+use crate::{render::UI_PIPELINE_HANDLE, sprite::Sprite, ColorMaterial, Rect, QUAD_HANDLE};
 use bevy_asset::Handle;
 use bevy_derive::EntityArchetype;
 use bevy_render::{mesh::Mesh, Renderable};

crates/bevy_ui/src/node.rs

@@ -34,7 +34,13 @@ impl Node {
         }
     }
 
-    pub fn update(&mut self, rect: &mut Rect, parent_dimensions: Vec2, parent_position: Vec2, z_index: f32) {
+    pub fn update(
+        &mut self,
+        rect: &mut Rect,
+        parent_dimensions: Vec2,
+        parent_position: Vec2,
+        z_index: f32,
+    ) {
         let (rect_x, rect_width) = Self::compute_dimension_properties(
             self.position.x(),
             self.margins.left,

crates/bevy_ui/src/rect.rs

@@ -12,6 +12,10 @@ pub struct Rect {
 }
 
 impl GetBytes for Rect {
-    fn get_bytes(&self) -> Vec<u8> { self.as_bytes().to_vec() }
-    fn get_bytes_ref(&self) -> Option<&[u8]> { Some(self.as_bytes()) }
+    fn get_bytes(&self) -> Vec<u8> {
+        self.as_bytes().to_vec()
+    }
+    fn get_bytes_ref(&self) -> Option<&[u8]> {
+        Some(self.as_bytes())
+    }
 }

crates/bevy_ui/src/sprite.rs

@@ -8,9 +8,7 @@ pub struct Sprite {
 
 impl Default for Sprite {
     fn default() -> Self {
-        Sprite {
-            scale: 1.0
-        }
+        Sprite { scale: 1.0 }
     }
 }
 

crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs

@@ -55,11 +55,7 @@ impl WgpuResourceDiagnosticsPlugin {
             10,
         ));
 
-        diagnostics.add(Diagnostic::new(
-            Self::SWAP_CHAINS,
-            "swap_chains",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::SWAP_CHAINS, "swap_chains", 10));
 
         diagnostics.add(Diagnostic::new(
             Self::SWAP_CHAIN_OUTPUTS,
@@ -67,35 +63,15 @@ impl WgpuResourceDiagnosticsPlugin {
             10,
         ));
 
-        diagnostics.add(Diagnostic::new(
-            Self::BUFFERS,
-            "buffers",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::BUFFERS, "buffers", 10));
 
-        diagnostics.add(Diagnostic::new(
-            Self::TEXTURES,
-            "textures",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::TEXTURES, "textures", 10));
 
-        diagnostics.add(Diagnostic::new(
-            Self::TEXTURE_VIEWS,
-            "texture_views",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::TEXTURE_VIEWS, "texture_views", 10));
 
-        diagnostics.add(Diagnostic::new(
-            Self::SAMPLERS,
-            "samplers",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::SAMPLERS, "samplers", 10));
 
-        diagnostics.add(Diagnostic::new(
-            Self::BIND_GROUPS,
-            "bind_groups",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::BIND_GROUPS, "bind_groups", 10));
 
         diagnostics.add(Diagnostic::new(
             Self::BIND_GROUP_LAYOUTS,
@@ -103,11 +79,7 @@ impl WgpuResourceDiagnosticsPlugin {
             10,
         ));
 
-        diagnostics.add(Diagnostic::new(
-            Self::SHADER_MODULES,
-            "shader_modules",
-            10,
-        ));
+        diagnostics.add(Diagnostic::new(Self::SHADER_MODULES, "shader_modules", 10));
 
         diagnostics.add(Diagnostic::new(
             Self::RENDER_PIPELINES,

crates/bevy_wgpu/src/lib.rs

@@ -1,5 +1,5 @@
-pub mod renderer;
 pub mod diagnostic;
+pub mod renderer;
 mod wgpu_render_pass;
 mod wgpu_renderer;
 mod wgpu_resources;
@@ -34,9 +34,9 @@ pub fn wgpu_render_system(resources: &mut Resources) -> impl FnMut(&mut World, &
             window_created_event.get_reader(),
         ))
     };
-    resources.insert(RenderResources::new(
-        WgpuRenderResourceContext::new(wgpu_renderer.device.clone()),
-    ));
+    resources.insert(RenderResources::new(WgpuRenderResourceContext::new(
+        wgpu_renderer.device.clone(),
+    )));
     move |world, resources| {
         wgpu_renderer.update(world, resources);
     }

crates/glsl-to-spirv/build/build.rs

@@ -1,12 +1,9 @@
 extern crate cmake;
 extern crate sha2;
 
-use std::env;
-use std::fs;
-use std::path::Path;
-use std::process::Command;
+use std::{env, fs, path::Path, process::Command};
 
-use sha2::{Sha256, Digest};
+use sha2::{Digest, Sha256};
 
 fn main() {
     println!("cargo:rerun-if-changed=build/glslangValidator.exe");
@@ -25,7 +22,6 @@ fn main() {
         let sha256sum = format!("{:x}", result);
         assert_eq!(sha256sum, SHA256SUM, "glslangValidator.exe checksum failed");
         path
-
     } else {
         // Try to initialize submodules. Don't care if it fails, since this code also runs for
         // the crates.io package.

crates/glsl-to-spirv/src/lib.rs

@@ -9,20 +9,23 @@
 
 extern crate tempfile;
 
-use std::fs::File;
-use std::io::Write;
-use std::process::Command;
+use std::{fs::File, io::Write, process::Command};
 
 pub type SpirvOutput = File;
 
-pub fn compile(code: &str, ty: ShaderType, shader_defs: Option<&[String]>) -> Result<SpirvOutput, String> {
+pub fn compile(
+    code: &str,
+    ty: ShaderType,
+    shader_defs: Option<&[String]>,
+) -> Result<SpirvOutput, String> {
     compile_inner(Some((code, ty)), shader_defs)
 }
 
 // Eventually the API will look like this, with an iterator for multiple shader stages.
 // However for the moment GLSLang doesn't like that, so we only pass one shader at a time.
 fn compile_inner<'a, I>(shaders: I, shader_defs: Option<&[String]>) -> Result<SpirvOutput, String>
-    where I: IntoIterator<Item = (&'a str, ShaderType)>
+where
+    I: IntoIterator<Item = (&'a str, ShaderType)>,
 {
     let temp_dir = tempfile::tempdir().unwrap();
     let output_file = temp_dir.path().join("compilation_output.spv");

examples/2d/sprite.rs

@@ -9,10 +9,7 @@ fn main() {
 
 fn setup(world: &mut World, resources: &mut Resources) {
     let mut texture_storage = resources.get_mut::<AssetStorage<Texture>>().unwrap();
-    let texture_path = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/assets/branding/icon.png"
-    );
+    let texture_path = concat!(env!("CARGO_MANIFEST_DIR"), "/assets/branding/icon.png");
     let texture = Texture::load(TextureType::Png(texture_path.to_string()));
     let texture_handle = texture_storage.add(texture);
     let mut color_materials = resources.get_mut::<AssetStorage<ColorMaterial>>().unwrap();

examples/ecs/ecs_guide.rs

@@ -341,7 +341,6 @@ fn main() {
         // score_check_system will run before game_over_system because score_check_system modifies GameState and game_over_system
         // reads GameState. This works, but it's a bit confusing. In practice, it would be clearer to create a new stage that runs
         // before "after_round"
-        
         // This call to run() starts the app we just built!
         .run();
 }

examples/ecs/startup_system.rs

@@ -1,7 +1,4 @@
-use bevy::{
-    app::schedule_runner::ScheduleRunnerPlugin,
-    prelude::*,
-};
+use bevy::{app::schedule_runner::ScheduleRunnerPlugin, prelude::*};
 
 fn main() {
     App::build()

src/prelude.rs

@@ -32,13 +32,13 @@ pub use crate::render::{
 #[cfg(feature = "transform")]
 pub use crate::transform::prelude::*;
 #[cfg(feature = "ui")]
-pub use crate::ui::{entity::*, Anchors, Rect, Sprite, Margins, Node, ColorMaterial};
+pub use crate::ui::{entity::*, Anchors, ColorMaterial, Margins, Node, Rect, Sprite};
 #[cfg(feature = "window")]
 pub use crate::window::{Window, WindowDescriptor, WindowPlugin, Windows};
 pub use crate::{
     app::{
-        stage, App, AppBuilder, AppPlugin, EntityArchetype, EventReader, Events, GetEventReader,
-        System, schedule_runner::ScheduleRunnerPlugin
+        schedule_runner::ScheduleRunnerPlugin, stage, App, AppBuilder, AppPlugin, EntityArchetype,
+        EventReader, Events, GetEventReader, System,
     },
     math::{self, Mat3, Mat4, Quat, Vec2, Vec3, Vec4},
     AddDefaultPlugins,