diff --git a/crates/bevy_app/src/app_builder.rs b/crates/bevy_app/src/app_builder.rs index 53f9cae622..f198ce1021 100644 --- a/crates/bevy_app/src/app_builder.rs +++ b/crates/bevy_app/src/app_builder.rs @@ -1,6 +1,8 @@ use crate::{ + app::{App, AppExit}, + event::Events, plugin::{load_plugin, AppPlugin}, - stage, startup_stage, app::{AppExit, App}, event::Events + stage, startup_stage, }; use bevy_ecs::{FromResources, IntoQuerySystem, Resources, System, World}; @@ -169,7 +171,9 @@ impl AppBuilder { stage_name: &'static str, system: Box, ) -> &mut Self { - self.app.schedule.add_system_to_stage_front(stage_name, system); + self.app + .schedule + .add_system_to_stage_front(stage_name, system); self } diff --git a/crates/bevy_app/src/plugin.rs b/crates/bevy_app/src/plugin.rs index b1faf82153..e0d130ca6f 100644 --- a/crates/bevy_app/src/plugin.rs +++ b/crates/bevy_app/src/plugin.rs @@ -1,6 +1,6 @@ +use crate::AppBuilder; use libloading::{Library, Symbol}; use std::any::Any; -use crate::AppBuilder; pub trait AppPlugin: Any + Send + Sync { fn build(&self, app: &mut AppBuilder); diff --git a/crates/bevy_app/src/schedule_runner.rs b/crates/bevy_app/src/schedule_runner.rs index d714abe17f..e89cd31654 100644 --- a/crates/bevy_app/src/schedule_runner.rs +++ b/crates/bevy_app/src/schedule_runner.rs @@ -1,6 +1,10 @@ use super::{App, AppBuilder}; +use crate::{ + app::AppExit, + event::{EventReader, Events}, + plugin::AppPlugin, +}; use std::{thread, time::Duration}; -use crate::{event::{Events, EventReader}, plugin::AppPlugin, app::AppExit}; #[derive(Copy, Clone, Debug)] pub enum RunMode { diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs index 37a850daee..4a83272bd2 100644 --- a/crates/bevy_audio/src/lib.rs +++ b/crates/bevy_audio/src/lib.rs @@ -8,7 +8,6 @@ pub mod prelude { pub use crate::{AudioOutput, AudioSource}; } - use bevy_app::prelude::*; use bevy_asset::AddAsset; use bevy_ecs::IntoQuerySystem; diff --git a/crates/bevy_core/src/label.rs b/crates/bevy_core/src/label.rs index 185ada37fd..d24807651a 100644 --- a/crates/bevy_core/src/label.rs +++ b/crates/bevy_core/src/label.rs @@ -2,7 +2,9 @@ use bevy_ecs::prelude::*; use bevy_property::Properties; use std::{ borrow::Cow, - collections::{HashMap, HashSet}, ops::{DerefMut, Deref}, fmt::Debug, + collections::{HashMap, HashSet}, + fmt::Debug, + ops::{Deref, DerefMut}, }; #[derive(Default, Properties)] @@ -21,15 +23,16 @@ impl Debug for Labels { } } -impl<'a, T, L: Into>> From for Labels where T: IntoIterator { +impl<'a, T, L: Into>> From for Labels +where + T: IntoIterator, +{ fn from(value: T) -> Self { let mut labels = HashSet::new(); for label in value { labels.insert(label.into()); } - Self { - labels, - } + Self { labels } } } diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs index 4d14ebf2ed..d248c2dac2 100644 --- a/crates/bevy_core/src/lib.rs +++ b/crates/bevy_core/src/lib.rs @@ -1,15 +1,15 @@ mod bytes; mod float_ord; -mod time; mod label; +mod time; pub use bytes::*; pub use float_ord::*; -pub use time::*; pub use label::*; +pub use time::*; pub mod prelude { - pub use crate::{Time, Timer, Labels, EntityLabels}; + pub use crate::{EntityLabels, Labels, Time, Timer}; } use bevy_app::prelude::*; diff --git a/crates/bevy_ecs/hecs/src/archetype.rs b/crates/bevy_ecs/hecs/src/archetype.rs index 89ded2071c..6874debf3e 100644 --- a/crates/bevy_ecs/hecs/src/archetype.rs +++ b/crates/bevy_ecs/hecs/src/archetype.rs @@ -140,7 +140,9 @@ impl Archetype { #[allow(missing_docs)] #[inline] - pub fn get_with_added_and_mutated(&self) -> Option<(NonNull, NonNull, NonNull)> { + pub fn get_with_added_and_mutated( + &self, + ) -> Option<(NonNull, NonNull, NonNull)> { let state = self.state.get(&TypeId::of::())?; Some(unsafe { ( @@ -351,8 +353,10 @@ impl Archetype { ); let type_state = self.state.get_mut(&ty.id).unwrap(); - type_state.mutated_entities[index as usize] = type_state.mutated_entities[last as usize]; - type_state.added_entities[index as usize] = type_state.added_entities[last as usize]; + type_state.mutated_entities[index as usize] = + type_state.mutated_entities[last as usize]; + type_state.added_entities[index as usize] = + type_state.added_entities[last as usize]; } } self.len = last; @@ -377,7 +381,7 @@ impl Archetype { .unwrap() .as_ptr(); let type_state = self.state.get(&ty.id).unwrap(); - let is_added= type_state.added_entities[index as usize]; + let is_added = type_state.added_entities[index as usize]; let is_mutated = type_state.mutated_entities[index as usize]; f(moved, ty.id(), ty.layout().size(), is_added, is_mutated); if index != last { @@ -389,8 +393,10 @@ impl Archetype { ty.layout.size(), ); let type_state = self.state.get_mut(&ty.id).unwrap(); - type_state.added_entities[index as usize] = type_state.added_entities[last as usize]; - type_state.mutated_entities[index as usize] = type_state.mutated_entities[last as usize]; + type_state.added_entities[index as usize] = + type_state.added_entities[last as usize]; + type_state.mutated_entities[index as usize] = + type_state.mutated_entities[last as usize]; } } self.len -= 1; @@ -403,15 +409,22 @@ impl Archetype { } #[allow(missing_docs)] - pub unsafe fn put_dynamic(&mut self, component: *mut u8, ty: TypeId, size: usize, index: u32, added: bool) { + pub unsafe fn put_dynamic( + &mut self, + component: *mut u8, + ty: TypeId, + size: usize, + index: u32, + added: bool, + ) { let state = self.state.get_mut(&ty).unwrap(); if added { state.added_entities[index as usize] = true; } let ptr = (*self.data.get()) - .as_ptr() - .add(state.offset + size * index as usize) - .cast::(); + .as_ptr() + .add(state.offset + size * index as usize) + .cast::(); ptr::copy_nonoverlapping(component, ptr, size); } diff --git a/crates/bevy_ecs/hecs/src/borrow.rs b/crates/bevy_ecs/hecs/src/borrow.rs index 5ad4bcc668..9220324123 100644 --- a/crates/bevy_ecs/hecs/src/borrow.rs +++ b/crates/bevy_ecs/hecs/src/borrow.rs @@ -15,9 +15,10 @@ // modified by Bevy contributors use core::{ + fmt::Debug, ops::{Deref, DerefMut}, ptr::NonNull, - sync::atomic::{AtomicUsize, Ordering}, fmt::Debug, + sync::atomic::{AtomicUsize, Ordering}, }; use crate::{archetype::Archetype, Component, MissingComponent}; @@ -101,7 +102,10 @@ impl<'a, T: Component> Deref for Ref<'a, T> { } } -impl<'a, T: Component> Debug for Ref<'a,T> where T: Debug { +impl<'a, T: Component> Debug for Ref<'a, T> +where + T: Debug, +{ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { self.deref().fmt(f) } @@ -161,7 +165,10 @@ impl<'a, T: Component> DerefMut for RefMut<'a, T> { } } -impl<'a, T: Component> Debug for RefMut<'a,T> where T: Debug { +impl<'a, T: Component> Debug for RefMut<'a, T> +where + T: Debug, +{ fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { self.deref().fmt(f) } diff --git a/crates/bevy_ecs/hecs/src/query.rs b/crates/bevy_ecs/hecs/src/query.rs index 63e5dea3de..e0edf0241c 100644 --- a/crates/bevy_ecs/hecs/src/query.rs +++ b/crates/bevy_ecs/hecs/src/query.rs @@ -319,14 +319,12 @@ impl<'a, T: Component> Fetch<'a> for FetchAdded { archetype.borrow::(); } unsafe fn get(archetype: &'a Archetype, offset: usize) -> Option { - archetype - .get_with_added::() - .map(|(components, added)| { - Self( - NonNull::new_unchecked(components.as_ptr().add(offset)), - NonNull::new_unchecked(added.as_ptr().add(offset)), - ) - }) + archetype.get_with_added::().map(|(components, added)| { + Self( + NonNull::new_unchecked(components.as_ptr().add(offset)), + NonNull::new_unchecked(added.as_ptr().add(offset)), + ) + }) } fn release(archetype: &Archetype) { archetype.release::(); @@ -346,7 +344,6 @@ impl<'a, T: Component> Fetch<'a> for FetchAdded { } } - #[allow(missing_docs)] pub struct Changed<'a, T> { value: &'a T, @@ -412,7 +409,6 @@ impl<'a, T: Component> Fetch<'a> for FetchChanged { } } - #[doc(hidden)] pub struct TryFetch(Option); diff --git a/crates/bevy_ecs/hecs/src/world.rs b/crates/bevy_ecs/hecs/src/world.rs index 5b59acc493..27eb1c925f 100644 --- a/crates/bevy_ecs/hecs/src/world.rs +++ b/crates/bevy_ecs/hecs/src/world.rs @@ -336,7 +336,9 @@ impl World { #[allow(missing_docs)] pub fn removed(&self) -> &[Entity] { - self.removed_components.get(&TypeId::of::()).map_or(&[], |entities| entities.as_slice()) + self.removed_components + .get(&TypeId::of::()) + .map_or(&[], |entities| entities.as_slice()) } /// Add `components` to `entity` @@ -501,7 +503,8 @@ impl World { state.added_entities[target_index as usize] = is_added; state.mutated_entities[target_index as usize] = is_mutated; } else { - let removed_entities = removed_components.entry(ty).or_insert_with(|| Vec::new()); + let removed_entities = + removed_components.entry(ty).or_insert_with(|| Vec::new()); removed_entities.push(entity); } }) diff --git a/crates/bevy_ecs/hecs/tests/tests.rs b/crates/bevy_ecs/hecs/tests/tests.rs index 9383e614ed..bed908a70b 100644 --- a/crates/bevy_ecs/hecs/tests/tests.rs +++ b/crates/bevy_ecs/hecs/tests/tests.rs @@ -343,24 +343,64 @@ fn remove_tracking() { let b = world.spawn(("abc", 123)); world.despawn(a).unwrap(); - assert_eq!(world.removed::(), &[a], "despawning results in 'removed component' state"); - assert_eq!(world.removed::<&'static str>(), &[a], "despawning results in 'removed component' state"); + assert_eq!( + world.removed::(), + &[a], + "despawning results in 'removed component' state" + ); + assert_eq!( + world.removed::<&'static str>(), + &[a], + "despawning results in 'removed component' state" + ); world.insert_one(b, 10.0).unwrap(); - assert_eq!(world.removed::(), &[a], "archetype moves does not result in 'removed component' state"); + assert_eq!( + world.removed::(), + &[a], + "archetype moves does not result in 'removed component' state" + ); world.remove_one::(b).unwrap(); - assert_eq!(world.removed::(), &[a, b], "removing a component results in a 'removed component' state"); + assert_eq!( + world.removed::(), + &[a, b], + "removing a component results in a 'removed component' state" + ); world.clear_trackers(); - assert_eq!(world.removed::(), &[], "clearning trackers clears removals"); - assert_eq!(world.removed::<&'static str>(), &[], "clearning trackers clears removals"); - assert_eq!(world.removed::(), &[], "clearning trackers clears removals"); + assert_eq!( + world.removed::(), + &[], + "clearning trackers clears removals" + ); + assert_eq!( + world.removed::<&'static str>(), + &[], + "clearning trackers clears removals" + ); + assert_eq!( + world.removed::(), + &[], + "clearning trackers clears removals" + ); let c = world.spawn(("abc", 123)); let d = world.spawn(("abc", 123)); world.clear(); - assert_eq!(world.removed::(), &[c, d], "world clears result in 'removed component' states"); - assert_eq!(world.removed::<&'static str>(), &[c, d, b], "world clears result in 'removed component' states"); - assert_eq!(world.removed::(), &[b], "world clears result in 'removed component' states"); -} \ No newline at end of file + assert_eq!( + world.removed::(), + &[c, d], + "world clears result in 'removed component' states" + ); + assert_eq!( + world.removed::<&'static str>(), + &[c, d, b], + "world clears result in 'removed component' states" + ); + assert_eq!( + world.removed::(), + &[b], + "world clears result in 'removed component' states" + ); +} diff --git a/crates/bevy_ecs/src/resource/mod.rs b/crates/bevy_ecs/src/resource/mod.rs index 2c681b9149..cf4d3f7541 100644 --- a/crates/bevy_ecs/src/resource/mod.rs +++ b/crates/bevy_ecs/src/resource/mod.rs @@ -2,4 +2,4 @@ mod resource_query; mod resources; pub use resource_query::*; -pub use resources::*; \ No newline at end of file +pub use resources::*; diff --git a/crates/bevy_ecs/src/resource/resources.rs b/crates/bevy_ecs/src/resource/resources.rs index 59385ae05f..bbabc7e772 100644 --- a/crates/bevy_ecs/src/resource/resources.rs +++ b/crates/bevy_ecs/src/resource/resources.rs @@ -67,11 +67,17 @@ impl Resources { let archetype = &mut data.archetype; let mut added = false; let index = match resource_index { - ResourceIndex::Global => *data.default_index.get_or_insert_with(|| { added = true; archetype.len() }), + ResourceIndex::Global => *data.default_index.get_or_insert_with(|| { + added = true; + archetype.len() + }), ResourceIndex::System(id) => *data .system_id_to_archetype_index .entry(id.0) - .or_insert_with(|| { added = true; archetype.len() }), + .or_insert_with(|| { + added = true; + archetype.len() + }), }; if index == archetype.len() { @@ -82,7 +88,13 @@ impl Resources { unsafe { let resource_ptr = (&mut resource as *mut T).cast::(); - archetype.put_dynamic(resource_ptr, type_id, core::mem::size_of::(), index, added); + archetype.put_dynamic( + resource_ptr, + type_id, + core::mem::size_of::(), + index, + added, + ); std::mem::forget(resource); } } diff --git a/crates/bevy_ecs/src/schedule/mod.rs b/crates/bevy_ecs/src/schedule/mod.rs index 1094d06453..8e617a17a5 100644 --- a/crates/bevy_ecs/src/schedule/mod.rs +++ b/crates/bevy_ecs/src/schedule/mod.rs @@ -2,4 +2,4 @@ mod parallel_executor; mod schedule; pub use parallel_executor::*; -pub use schedule::*; \ No newline at end of file +pub use schedule::*; diff --git a/crates/bevy_ecs/src/schedule/schedule.rs b/crates/bevy_ecs/src/schedule/schedule.rs index c9e177e4b3..c8db341ae5 100644 --- a/crates/bevy_ecs/src/schedule/schedule.rs +++ b/crates/bevy_ecs/src/schedule/schedule.rs @@ -1,12 +1,13 @@ use crate::{ - system::{System, ThreadLocalExecution, SystemId}, resource::Resources, + resource::Resources, + system::{System, SystemId, ThreadLocalExecution}, }; +use hecs::World; use std::{ borrow::Cow, collections::{HashMap, HashSet}, sync::{Arc, Mutex}, }; -use hecs::World; #[derive(Default)] pub struct Schedule { diff --git a/crates/bevy_ecs/src/system/into_system.rs b/crates/bevy_ecs/src/system/into_system.rs index 2e9de795c7..78a8427f1f 100644 --- a/crates/bevy_ecs/src/system/into_system.rs +++ b/crates/bevy_ecs/src/system/into_system.rs @@ -157,10 +157,11 @@ impl<'a, Q: HecsQuery> Query<'a, Q> { if self .archetype_access .immutable - .contains(location.archetype as usize) || self - .archetype_access - .mutable .contains(location.archetype as usize) + || self + .archetype_access + .mutable + .contains(location.archetype as usize) { self.world .get(entity) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 14e5186ff1..555b48bc02 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -8,4 +8,4 @@ pub use commands::*; pub use into_system::*; #[cfg(feature = "profiler")] pub use profiler::*; -pub use system::*; \ No newline at end of file +pub use system::*; diff --git a/crates/bevy_ecs/src/system/system.rs b/crates/bevy_ecs/src/system/system.rs index d09142f5c2..ca3decedac 100644 --- a/crates/bevy_ecs/src/system/system.rs +++ b/crates/bevy_ecs/src/system/system.rs @@ -100,9 +100,9 @@ impl TypeAccess { #[cfg(test)] mod tests { use super::{ArchetypeAccess, TypeAccess}; + use crate::resource::{FetchResource, Res, ResMut, ResourceQuery}; use hecs::World; use std::any::TypeId; - use crate::resource::{Res, ResourceQuery, ResMut, FetchResource}; struct A; struct B; diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs index ff14824147..aba809de37 100644 --- a/crates/bevy_ecs/src/world/mod.rs +++ b/crates/bevy_ecs/src/world/mod.rs @@ -1,3 +1,3 @@ mod world_builder; -pub use world_builder::*; \ No newline at end of file +pub use world_builder::*; diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs index 22639b2e23..893cac6fa8 100644 --- a/crates/bevy_input/src/keyboard.rs +++ b/crates/bevy_input/src/keyboard.rs @@ -1,6 +1,6 @@ use crate::Input; -use bevy_ecs::{Res, ResMut}; use bevy_app::prelude::*; +use bevy_ecs::{Res, ResMut}; #[derive(Debug, Clone)] pub struct KeyboardInput { diff --git a/crates/bevy_math/src/perspective.rs b/crates/bevy_math/src/perspective.rs index a5c57ecc85..eb755f3f74 100644 --- a/crates/bevy_math/src/perspective.rs +++ b/crates/bevy_math/src/perspective.rs @@ -9,7 +9,7 @@ impl PerspectiveRh for Mat4 { fn perspective_rh(fov_y_radians: f32, aspect_ratio: f32, z_near: f32, z_far: f32) -> Self { let (sin_fov, cos_fov) = (0.5 * fov_y_radians).sin_cos(); let h = cos_fov / sin_fov; - let w = h /aspect_ratio; + let w = h / aspect_ratio; let r = z_far / (z_near - z_far); Mat4::from_cols( Vec4::new(w, 0.0, 0.0, 0.0), diff --git a/crates/bevy_render/src/camera/projection.rs b/crates/bevy_render/src/camera/projection.rs index e6d886df8c..e3e53adc0b 100644 --- a/crates/bevy_render/src/camera/projection.rs +++ b/crates/bevy_render/src/camera/projection.rs @@ -1,4 +1,4 @@ -use bevy_math::{PerspectiveRh, Mat4}; +use bevy_math::{Mat4, PerspectiveRh}; use bevy_property::{Properties, Property}; use serde::{Deserialize, Serialize}; diff --git a/crates/bevy_render/src/entity.rs b/crates/bevy_render/src/entity.rs index 88a177a787..540d403a9c 100644 --- a/crates/bevy_render/src/entity.rs +++ b/crates/bevy_render/src/entity.rs @@ -61,7 +61,7 @@ pub struct Camera2dComponents { impl Default for Camera2dComponents { fn default() -> Self { // we want 0 to be "closest" and +far to be "farthest" in 2d, so we offset - // the camera's translation by far and use a right handed coordinate system + // the camera's translation by far and use a right handed coordinate system let far = 1000.0; Camera2dComponents { camera: Camera { diff --git a/crates/bevy_render/src/mesh/mod.rs b/crates/bevy_render/src/mesh/mod.rs index 0ee49efd90..94e5170594 100644 --- a/crates/bevy_render/src/mesh/mod.rs +++ b/crates/bevy_render/src/mesh/mod.rs @@ -2,4 +2,4 @@ mod mesh; mod vertex; pub use mesh::*; -pub use vertex::*; \ No newline at end of file +pub use vertex::*; diff --git a/crates/bevy_text/src/draw.rs b/crates/bevy_text/src/draw.rs index 649ce0c58d..315000eb56 100644 --- a/crates/bevy_text/src/draw.rs +++ b/crates/bevy_text/src/draw.rs @@ -1,7 +1,7 @@ use crate::{Font, FontAtlasSet}; use ab_glyph::{FontVec, Glyph, PxScale, PxScaleFont, ScaleFont}; use bevy_asset::Assets; -use bevy_math::{Mat4, Vec3, Vec2}; +use bevy_math::{Mat4, Vec2, Vec3}; use bevy_render::{ color::Color, draw::{Draw, DrawContext, DrawError, Drawable}, @@ -112,9 +112,12 @@ impl<'a> Drawable for DrawableText<'a> { match self.style.align { TextAlign::Left => { /* already aligned left by default */ } TextAlign::Center => { - *caret.x_mut() += self.container_size.x() / 2.0 - get_text_width(&self.text, &scaled_font) / 2.0 + *caret.x_mut() += + self.container_size.x() / 2.0 - get_text_width(&self.text, &scaled_font) / 2.0 + } + TextAlign::Right => { + *caret.x_mut() += self.container_size.x() - get_text_width(&self.text, &scaled_font) } - TextAlign::Right => *caret.x_mut() += self.container_size.x() - get_text_width(&self.text, &scaled_font), } let mut last_glyph: Option = None; diff --git a/crates/bevy_text/src/lib.rs b/crates/bevy_text/src/lib.rs index 20669df68f..204b0ec32b 100644 --- a/crates/bevy_text/src/lib.rs +++ b/crates/bevy_text/src/lib.rs @@ -11,7 +11,7 @@ pub use font_atlas_set::*; pub use font_loader::*; pub mod prelude { - pub use crate::{Font, TextStyle, TextAlign}; + pub use crate::{Font, TextAlign, TextStyle}; } use bevy_app::prelude::*; diff --git a/crates/bevy_transform/src/components/children.rs b/crates/bevy_transform/src/components/children.rs index 861e3fa134..47a9f1402b 100644 --- a/crates/bevy_transform/src/components/children.rs +++ b/crates/bevy_transform/src/components/children.rs @@ -1,7 +1,7 @@ use bevy_ecs::Entity; use bevy_property::Properties; use smallvec::SmallVec; -use std::ops::{DerefMut, Deref}; +use std::ops::{Deref, DerefMut}; #[derive(Default, Clone, Properties, Debug)] pub struct Children(pub SmallVec<[Entity; 8]>); @@ -23,4 +23,4 @@ impl DerefMut for Children { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/components/local_transform.rs b/crates/bevy_transform/src/components/local_transform.rs index a60719318b..1ae79197d7 100644 --- a/crates/bevy_transform/src/components/local_transform.rs +++ b/crates/bevy_transform/src/components/local_transform.rs @@ -1,6 +1,9 @@ use bevy_math::Mat4; use bevy_property::Properties; -use std::{ops::{DerefMut, Deref}, fmt}; +use std::{ + fmt, + ops::{Deref, DerefMut}, +}; #[derive(Debug, PartialEq, Clone, Copy, Properties)] pub struct LocalTransform(pub Mat4); @@ -34,4 +37,4 @@ impl DerefMut for LocalTransform { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/components/non_uniform_scale.rs b/crates/bevy_transform/src/components/non_uniform_scale.rs index d73c881cf5..00f77d3c1f 100644 --- a/crates/bevy_transform/src/components/non_uniform_scale.rs +++ b/crates/bevy_transform/src/components/non_uniform_scale.rs @@ -1,6 +1,9 @@ use bevy_math::Vec3; use bevy_property::Properties; -use std::{ops::{DerefMut, Deref}, fmt}; +use std::{ + fmt, + ops::{Deref, DerefMut}, +}; #[derive(Debug, PartialEq, Clone, Copy, Properties)] pub struct NonUniformScale(pub Vec3); @@ -53,4 +56,4 @@ impl DerefMut for NonUniformScale { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/components/parent.rs b/crates/bevy_transform/src/components/parent.rs index ab0a455d87..d6d59840f1 100644 --- a/crates/bevy_transform/src/components/parent.rs +++ b/crates/bevy_transform/src/components/parent.rs @@ -1,6 +1,6 @@ -use bevy_ecs::{FromResources, Entity}; +use bevy_ecs::{Entity, FromResources}; use bevy_property::Properties; -use std::ops::{DerefMut, Deref}; +use std::ops::{Deref, DerefMut}; #[derive(Debug, Copy, Clone, Eq, PartialEq, Properties)] pub struct Parent(pub Entity); @@ -11,7 +11,7 @@ pub struct Parent(pub Entity); // ways to handle cases like this. impl FromResources for Parent { fn from_resources(_resources: &bevy_ecs::Resources) -> Self { - Parent(Entity::from_id(u32::MAX)) + Parent(Entity::from_id(u32::MAX)) } } @@ -29,4 +29,4 @@ impl DerefMut for Parent { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/components/rotation.rs b/crates/bevy_transform/src/components/rotation.rs index 197b006d81..e97b6a64bc 100644 --- a/crates/bevy_transform/src/components/rotation.rs +++ b/crates/bevy_transform/src/components/rotation.rs @@ -34,4 +34,4 @@ impl DerefMut for Rotation { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/components/scale.rs b/crates/bevy_transform/src/components/scale.rs index edb364ca85..80ace74766 100644 --- a/crates/bevy_transform/src/components/scale.rs +++ b/crates/bevy_transform/src/components/scale.rs @@ -1,5 +1,8 @@ use bevy_property::Properties; -use std::{ops::{DerefMut, Deref}, fmt}; +use std::{ + fmt, + ops::{Deref, DerefMut}, +}; #[derive(Debug, PartialEq, Clone, Copy, Properties)] pub struct Scale(pub f32); @@ -41,4 +44,4 @@ impl DerefMut for Scale { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/components/translation.rs b/crates/bevy_transform/src/components/translation.rs index 3e6e66039d..b4211f93b5 100644 --- a/crates/bevy_transform/src/components/translation.rs +++ b/crates/bevy_transform/src/components/translation.rs @@ -1,6 +1,6 @@ use bevy_math::Vec3; use bevy_property::Properties; -use std::ops::{DerefMut, Deref}; +use std::ops::{Deref, DerefMut}; #[derive(Debug, PartialEq, Copy, Clone, Properties)] pub struct Translation(pub Vec3); @@ -40,4 +40,4 @@ impl DerefMut for Translation { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.0 } -} \ No newline at end of file +} diff --git a/crates/bevy_transform/src/hierarchy/world_child_builder.rs b/crates/bevy_transform/src/hierarchy/world_child_builder.rs index 2a343a39c8..54230ab712 100644 --- a/crates/bevy_transform/src/hierarchy/world_child_builder.rs +++ b/crates/bevy_transform/src/hierarchy/world_child_builder.rs @@ -1,4 +1,4 @@ -use crate::prelude::{LocalTransform, Parent, PreviousParent, Children}; +use crate::prelude::{Children, LocalTransform, Parent, PreviousParent}; use bevy_ecs::{Component, DynamicBundle, Entity, WorldBuilder}; pub struct WorldChildBuilder<'a, 'b> { diff --git a/crates/bevy_transform/src/lib.rs b/crates/bevy_transform/src/lib.rs index e9690098b1..da80de1603 100644 --- a/crates/bevy_transform/src/lib.rs +++ b/crates/bevy_transform/src/lib.rs @@ -11,7 +11,9 @@ pub mod prelude { use bevy_app::prelude::*; use bevy_ecs::prelude::*; use bevy_type_registry::RegisterType; -use prelude::{Children, LocalTransform, NonUniformScale, Rotation, Scale, Transform, Translation, Parent}; +use prelude::{ + Children, LocalTransform, NonUniformScale, Parent, Rotation, Scale, Transform, Translation, +}; pub(crate) fn transform_systems() -> Vec> { let mut systems = Vec::with_capacity(5); diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index 4618794e51..92f2ea9e33 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -50,4 +50,4 @@ impl AppPlugin for UiPlugin { let mut render_graph = resources.get_mut::().unwrap(); render_graph.add_ui_graph(resources); } -} \ No newline at end of file +} diff --git a/crates/bevy_ui/src/widget/button.rs b/crates/bevy_ui/src/widget/button.rs index 04b8456545..fef7c51320 100644 --- a/crates/bevy_ui/src/widget/button.rs +++ b/crates/bevy_ui/src/widget/button.rs @@ -1 +1 @@ -pub struct Button; \ No newline at end of file +pub struct Button; diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs index d4bb98dfab..654a57edf2 100644 --- a/crates/bevy_ui/src/widget/text.rs +++ b/crates/bevy_ui/src/widget/text.rs @@ -72,4 +72,4 @@ pub fn draw_text_system( }; drawable_text.draw(&mut draw, &mut draw_context).unwrap(); } -} \ No newline at end of file +} diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs index baa33c3062..975bfe8c71 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -267,9 +267,14 @@ impl RenderResourceContext for WgpuRenderResourceContext { if let Some(texture_id) = self.try_next_swap_chain_texture(window.id) { texture_id } else { - self.resources.window_swap_chains.write().unwrap().remove(&window.id); + self.resources + .window_swap_chains + .write() + .unwrap() + .remove(&window.id); self.create_swap_chain(window); - self.try_next_swap_chain_texture(window.id).expect("Failed to acquire next swap chain texture!") + self.try_next_swap_chain_texture(window.id) + .expect("Failed to acquire next swap chain texture!") } } diff --git a/crates/bevy_window/src/window.rs b/crates/bevy_window/src/window.rs index bc85c5cc9a..bffb0121fc 100644 --- a/crates/bevy_window/src/window.rs +++ b/crates/bevy_window/src/window.rs @@ -13,7 +13,7 @@ impl WindowId { } pub fn is_primary(&self) -> bool { - *self == WindowId::primary() + *self == WindowId::primary() } pub fn to_string(&self) -> String { diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs index ee8d427763..309b1d7947 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs @@ -91,9 +91,7 @@ pub fn winit_runner(mut app: App) { let windows = app.resources.get_mut::().unwrap(); let winit_windows = app.resources.get_mut::().unwrap(); let window_id = winit_windows.get_window_id(winit_window_id).unwrap(); - window_close_requested_events.send(WindowCloseRequested { - id: window_id, - }); + window_close_requested_events.send(WindowCloseRequested { id: window_id }); } WindowEvent::KeyboardInput { ref input, .. } => { let mut keyboard_input_events = @@ -108,7 +106,7 @@ pub fn winit_runner(mut app: App) { let window = winit_windows.get_window(window_id).unwrap(); let inner_size = window.inner_size(); // move origin to bottom left - let y_position = inner_size.height as f32 - position.y as f32; + let y_position = inner_size.height as f32 - position.y as f32; cursor_moved_events.send(CursorMoved { id: window_id, position: Vec2::new(position.x as f32, y_position as f32), @@ -161,8 +159,6 @@ fn handle_create_window_events( winit_windows.create_window(event_loop, &window); let window_id = window.id; windows.add(window); - window_created_events.send(WindowCreated { - id: window_id, - }); + window_created_events.send(WindowCreated { id: window_id }); } } diff --git a/examples/hello_world.rs b/examples/hello_world.rs index c90ea0ce7d..5078ebb2e2 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -1,9 +1,7 @@ use bevy::prelude::*; fn main() { - App::build() - .add_system(hello_world_system.system()) - .run(); + App::build().add_system(hello_world_system.system()).run(); } fn hello_world_system() { diff --git a/examples/ui/ui.rs b/examples/ui/ui.rs index 332c846287..1dcdfb210b 100644 --- a/examples/ui/ui.rs +++ b/examples/ui/ui.rs @@ -239,6 +239,5 @@ fn setup( .spawn(NodeComponents { material: materials.add(Color::rgb(1.0, 0.0, 0.0).into()), ..Default::default() - }) - ; + }); } diff --git a/src/prelude.rs b/src/prelude.rs index 1c476ddea4..4ea955c5a1 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -1,20 +1,6 @@ pub use crate::{ - app::prelude::*, - asset::prelude::*, - audio::prelude::*, - core::prelude::*, - ecs::prelude::*, - input::prelude::*, - math::prelude::*, - pbr::prelude::*, - property::prelude::*, - render::prelude::*, - scene::prelude::*, - sprite::prelude::*, - text::prelude::*, - transform::prelude::*, - type_registry::RegisterType, - window::prelude::*, - ui::prelude::*, - AddDefaultPlugins, + app::prelude::*, asset::prelude::*, audio::prelude::*, core::prelude::*, ecs::prelude::*, + input::prelude::*, math::prelude::*, pbr::prelude::*, property::prelude::*, render::prelude::*, + scene::prelude::*, sprite::prelude::*, text::prelude::*, transform::prelude::*, + type_registry::RegisterType, ui::prelude::*, window::prelude::*, AddDefaultPlugins, };