From 45a710fe6ac2e5ff9ebdd12f6ffb949a6364e458 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Wed, 29 Apr 2020 01:37:54 -0700 Subject: [PATCH] cargo fmt --- crates/bevy_app/src/lib.rs | 2 +- crates/bevy_app/src/schedule_plan.rs | 2 +- crates/bevy_app/src/system.rs | 4 ++-- crates/bevy_legion/legion_core/src/lib.rs | 6 +++--- .../legion_core/src/system_fn_types.rs | 19 ++++++++++++++----- crates/bevy_legion/legion_systems/src/lib.rs | 14 +++++++++----- .../legion_systems/src/resource.rs | 12 +++--------- .../bevy_legion/legion_systems/src/system.rs | 9 +++++---- .../legion_systems/src/system_fn.rs | 2 -- .../legion_systems/src/system_fn_types.rs | 18 +++++++----------- crates/bevy_render/src/color.rs | 2 +- .../assigned_batches_draw_target.rs | 3 ++- crates/bevy_render/src/mesh.rs | 3 ++- .../nodes/window_swapchain_node.rs | 6 ++++-- .../render_graph/nodes/window_texture_node.rs | 6 ++++-- crates/bevy_render/src/shader/uniform.rs | 3 ++- crates/bevy_wgpu/src/wgpu_renderer.rs | 5 +++-- examples/systems.rs | 3 ++- src/prelude.rs | 14 ++++++++------ 19 files changed, 73 insertions(+), 60 deletions(-) diff --git a/crates/bevy_app/src/lib.rs b/crates/bevy_app/src/lib.rs index d99035a664..4f8b326f1f 100644 --- a/crates/bevy_app/src/lib.rs +++ b/crates/bevy_app/src/lib.rs @@ -3,10 +3,10 @@ mod app_builder; mod entity_archetype; mod event; mod plugin; -mod system; pub mod schedule_plan; pub mod schedule_runner; pub mod stage; +mod system; pub use app::*; pub use app_builder::*; diff --git a/crates/bevy_app/src/schedule_plan.rs b/crates/bevy_app/src/schedule_plan.rs index 3df1df62c7..f5a00f25eb 100644 --- a/crates/bevy_app/src/schedule_plan.rs +++ b/crates/bevy_app/src/schedule_plan.rs @@ -1,6 +1,6 @@ -use std::{cmp::Ordering, collections::HashMap}; use crate::System; use legion::prelude::Schedule; +use std::{cmp::Ordering, collections::HashMap}; #[derive(Default)] pub struct SchedulePlan { diff --git a/crates/bevy_app/src/system.rs b/crates/bevy_app/src/system.rs index 5e136b83ab..b8cb543e7e 100644 --- a/crates/bevy_app/src/system.rs +++ b/crates/bevy_app/src/system.rs @@ -1,8 +1,8 @@ use legion::{ filter::EntityFilter, prelude::{ - into_resource_system, IntoQuery, ResourceSet, Resources, Runnable, - Schedulable, World, into_resource_for_each_system, + into_resource_for_each_system, into_resource_system, IntoQuery, ResourceSet, Resources, + Runnable, Schedulable, World, }, query::{DefaultFilter, View}, }; diff --git a/crates/bevy_legion/legion_core/src/lib.rs b/crates/bevy_legion/legion_core/src/lib.rs index 4b3ceb4d12..0c5d46de99 100644 --- a/crates/bevy_legion/legion_core/src/lib.rs +++ b/crates/bevy_legion/legion_core/src/lib.rs @@ -15,19 +15,19 @@ pub mod world; #[cfg(feature = "serialize")] pub mod serialize; +mod system_fn_types; mod tuple; mod zip; -mod system_fn_types; pub mod prelude { pub use crate::{ + // used by system_fn + borrow::{Ref, RefMut}, command::CommandBuffer, entity::Entity, event::Event, filter::filter_fns::*, query::{IntoQuery, Query, Read, Tagged, TryRead, TryWrite, Write}, world::{Universe, World}, - // used by system_fn - borrow::{Ref, RefMut} }; } diff --git a/crates/bevy_legion/legion_core/src/system_fn_types.rs b/crates/bevy_legion/legion_core/src/system_fn_types.rs index 9f210d25aa..4ebff7aff7 100644 --- a/crates/bevy_legion/legion_core/src/system_fn_types.rs +++ b/crates/bevy_legion/legion_core/src/system_fn_types.rs @@ -1,5 +1,14 @@ -use crate::{borrow::{RefIterMut, RefMut, RefIter, Ref}, storage::{ArchetypeData, Component, ComponentStorage, ComponentTypeId}, query::{View, DefaultFilter, ViewElement}, filter::{ComponentFilter, EntityFilterTuple, Passthrough}, index::{SetIndex, ChunkIndex}}; -use std::{any::TypeId, slice::{IterMut, Iter}}; +use crate::{ + borrow::{Ref, RefIter, RefIterMut, RefMut}, + filter::{ComponentFilter, EntityFilterTuple, Passthrough}, + index::{ChunkIndex, SetIndex}, + query::{DefaultFilter, View, ViewElement}, + storage::{ArchetypeData, Component, ComponentStorage, ComponentTypeId}, +}; +use std::{ + any::TypeId, + slice::{Iter, IterMut}, +}; impl<'a, T: Component> DefaultFilter for RefMut<'static, T> { type Filter = EntityFilterTuple, Passthrough, Passthrough>; @@ -7,7 +16,7 @@ impl<'a, T: Component> DefaultFilter for RefMut<'static, T> { fn filter() -> Self::Filter { super::filter::filter_fns::component() } } -impl<'a, T: Component> View<'a> for RefMut<'static, T>{ +impl<'a, T: Component> View<'a> for RefMut<'static, T> { type Iter = RefIterMut<'a, T, IterMut<'a, T>>; #[inline] @@ -58,7 +67,7 @@ impl<'a, T: Component> DefaultFilter for Ref<'static, T> { fn filter() -> Self::Filter { super::filter::filter_fns::component() } } -impl<'a, T: Component> View<'a> for Ref<'static, T>{ +impl<'a, T: Component> View<'a> for Ref<'static, T> { type Iter = RefIter<'a, T, Iter<'a, T>>; #[inline] @@ -101,4 +110,4 @@ impl<'a, T: Component> View<'a> for Ref<'static, T>{ impl<'a, T: Component> ViewElement for Ref<'static, T> { type Component = T; -} \ No newline at end of file +} diff --git a/crates/bevy_legion/legion_systems/src/lib.rs b/crates/bevy_legion/legion_systems/src/lib.rs index 4841ecca4b..59e7e2d1cf 100644 --- a/crates/bevy_legion/legion_systems/src/lib.rs +++ b/crates/bevy_legion/legion_systems/src/lib.rs @@ -2,9 +2,9 @@ pub mod resource; pub mod schedule; +mod system; mod system_fn; mod system_fn_types; -mod system; pub use bit_set; pub use system::*; @@ -13,11 +13,15 @@ pub use system_fn::*; pub mod prelude { pub use crate::{ bit_set::BitSet, + into_resource_for_each_system, + into_resource_system, // aliased preparedread and preparedwrite used by system_fn - resource::{ResourceSet, Resources, PreparedRead as Resource, PreparedWrite as ResourceMut}, + resource::{ + PreparedRead as Resource, PreparedWrite as ResourceMut, ResourceSet, Resources, + }, schedule::{Executor, Runnable, Schedulable, Schedule}, - System, SystemBuilder, - into_resource_system, into_resource_for_each_system, - IntoSystem + IntoSystem, + System, + SystemBuilder, }; } diff --git a/crates/bevy_legion/legion_systems/src/resource.rs b/crates/bevy_legion/legion_systems/src/resource.rs index b8ef714476..e044b821b4 100644 --- a/crates/bevy_legion/legion_systems/src/resource.rs +++ b/crates/bevy_legion/legion_systems/src/resource.rs @@ -381,9 +381,7 @@ impl ResourceSet for Read { .unwrap_or_else(|| panic!("Failed to fetch resource!: {}", std::any::type_name::())); PreparedRead::new(resource.deref() as *const T) } - fn read_types() -> Vec { - vec![ResourceTypeId::of::()] - } + fn read_types() -> Vec { vec![ResourceTypeId::of::()] } fn write_types() -> Vec { Vec::new() } } impl ResourceSet for Write { @@ -395,12 +393,8 @@ impl ResourceSet for Write { .unwrap_or_else(|| panic!("Failed to fetch resource!: {}", std::any::type_name::())); PreparedWrite::new(resource.deref_mut() as *mut T) } - fn read_types() -> Vec { - Vec::new() - } - fn write_types() -> Vec { - vec![ResourceTypeId::of::()] - } + fn read_types() -> Vec { Vec::new() } + fn write_types() -> Vec { vec![ResourceTypeId::of::()] } } macro_rules! impl_resource_tuple { diff --git a/crates/bevy_legion/legion_systems/src/system.rs b/crates/bevy_legion/legion_systems/src/system.rs index 68c96f4f1a..a1984546be 100644 --- a/crates/bevy_legion/legion_systems/src/system.rs +++ b/crates/bevy_legion/legion_systems/src/system.rs @@ -896,10 +896,11 @@ pub trait SystemFn { ); } -pub struct SystemFnWrapper( - pub F, - pub PhantomData<(R, Q)>, -); +pub struct SystemFnWrapper< + R, + Q, + F: FnMut(&mut CommandBuffer, &mut SubWorld, &mut R, &mut Q) + 'static, +>(pub F, pub PhantomData<(R, Q)>); impl SystemFn for SystemFnWrapper where diff --git a/crates/bevy_legion/legion_systems/src/system_fn.rs b/crates/bevy_legion/legion_systems/src/system_fn.rs index fed92d6a33..c26f735cfe 100644 --- a/crates/bevy_legion/legion_systems/src/system_fn.rs +++ b/crates/bevy_legion/legion_systems/src/system_fn.rs @@ -13,7 +13,6 @@ use legion_core::{ }; use std::marker::PhantomData; - pub fn into_resource_for_each_system<'a, Q, F, R, X>( name: &'static str, mut system: F, @@ -154,7 +153,6 @@ where // } // } - impl< 'a, F, diff --git a/crates/bevy_legion/legion_systems/src/system_fn_types.rs b/crates/bevy_legion/legion_systems/src/system_fn_types.rs index ae79b44357..7b4429cb63 100644 --- a/crates/bevy_legion/legion_systems/src/system_fn_types.rs +++ b/crates/bevy_legion/legion_systems/src/system_fn_types.rs @@ -1,4 +1,6 @@ -use crate::resource::{PreparedRead, ResourceSet, Resources, Resource, PreparedWrite, ResourceTypeId}; +use crate::resource::{ + PreparedRead, PreparedWrite, Resource, ResourceSet, ResourceTypeId, Resources, +}; use std::ops::{Deref, DerefMut}; impl ResourceSet for PreparedRead { @@ -10,9 +12,7 @@ impl ResourceSet for PreparedRead { .unwrap_or_else(|| panic!("Failed to fetch resource!: {}", std::any::type_name::())); PreparedRead::new(resource.deref() as *const T) } - fn read_types() -> Vec { - vec![ResourceTypeId::of::()] - } + fn read_types() -> Vec { vec![ResourceTypeId::of::()] } fn write_types() -> Vec { Vec::new() } } @@ -25,10 +25,6 @@ impl ResourceSet for PreparedWrite { .unwrap_or_else(|| panic!("Failed to fetch resource!: {}", std::any::type_name::())); PreparedWrite::new(resource.deref_mut() as *mut T) } - fn read_types() -> Vec { - Vec::new() - } - fn write_types() -> Vec { - vec![ResourceTypeId::of::()] - } -} \ No newline at end of file + fn read_types() -> Vec { Vec::new() } + fn write_types() -> Vec { vec![ResourceTypeId::of::()] } +} diff --git a/crates/bevy_render/src/color.rs b/crates/bevy_render/src/color.rs index ba17194747..be7ae1c23a 100644 --- a/crates/bevy_render/src/color.rs +++ b/crates/bevy_render/src/color.rs @@ -3,7 +3,7 @@ use crate::shader::ShaderDefSuffixProvider; use bevy_asset::Handle; use bevy_core::bytes::GetBytes; use glam::Vec4; -use std::ops::{AddAssign, Add}; +use std::ops::{Add, AddAssign}; use zerocopy::AsBytes; #[repr(C)] diff --git a/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs b/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs index b5e2ea97db..5c03368778 100644 --- a/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs +++ b/crates/bevy_render/src/draw_target/draw_targets/assigned_batches_draw_target.rs @@ -1,10 +1,11 @@ use crate::{ + batch::AssetBatchers, draw_target::DrawTarget, pass::RenderPass, pipeline::PipelineDescriptor, render_resource::{resource_name, RenderResourceAssignments}, renderer::RenderContext, - Renderable, batch::AssetBatchers, + Renderable, }; use bevy_asset::Handle; use legion::prelude::*; diff --git a/crates/bevy_render/src/mesh.rs b/crates/bevy_render/src/mesh.rs index fa446eb049..cd63f53cf4 100644 --- a/crates/bevy_render/src/mesh.rs +++ b/crates/bevy_render/src/mesh.rs @@ -1,4 +1,5 @@ use crate::{ + batch::AssetBatchers, pipeline::{ state_descriptors::{IndexFormat, PrimitiveTopology}, VertexBufferDescriptor, VertexBufferDescriptors, VertexFormat, @@ -6,7 +7,7 @@ use crate::{ render_resource::{BufferInfo, BufferUsage, RenderResourceAssignments}, renderer::{GlobalRenderResourceContext, RenderResourceContext}, shader::AsUniforms, - Renderable, Vertex, batch::AssetBatchers, + Renderable, Vertex, }; use bevy_asset::{AssetStorage, Handle}; use glam::*; diff --git a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs index e81e135f4d..1702d58403 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_swapchain_node.rs @@ -61,10 +61,12 @@ impl Node for WindowSwapChainNode { let render_resources = render_context.resources_mut(); // create window swapchain when window is resized or created - if self.window_created_event_reader + if self + .window_created_event_reader .find_latest(&window_created_events, |e| e.id == window.id) .is_some() - || self.window_resized_event_reader + || self + .window_resized_event_reader .find_latest(&window_resized_events, |e| e.id == window.id) .is_some() { diff --git a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs index 7484abb0c8..f6e34928ae 100644 --- a/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/window_texture_node.rs @@ -62,10 +62,12 @@ impl Node for WindowTextureNode { .expect("Received window resized event for non-existent window"), }; - if self.window_created_event_reader + if self + .window_created_event_reader .find_latest(&window_created_events, |e| e.id == window.id) .is_some() - || self.window_resized_event_reader + || self + .window_resized_event_reader .find_latest(&window_resized_events, |e| e.id == window.id) .is_some() { diff --git a/crates/bevy_render/src/shader/uniform.rs b/crates/bevy_render/src/shader/uniform.rs index f23d36e5da..8c36729345 100644 --- a/crates/bevy_render/src/shader/uniform.rs +++ b/crates/bevy_render/src/shader/uniform.rs @@ -1,8 +1,9 @@ use crate::{ + batch::AssetBatchers, color::ColorSource, pipeline::{BindType, VertexBufferDescriptor}, texture::Texture, - Renderable, batch::AssetBatchers, + Renderable, }; use bevy_asset::{AssetStorage, Handle}; diff --git a/crates/bevy_wgpu/src/wgpu_renderer.rs b/crates/bevy_wgpu/src/wgpu_renderer.rs index be6e67a683..da052c1915 100644 --- a/crates/bevy_wgpu/src/wgpu_renderer.rs +++ b/crates/bevy_wgpu/src/wgpu_renderer.rs @@ -59,8 +59,9 @@ impl WgpuRenderer { .unwrap(); let windows = resources.get::().unwrap(); let window_created_events = resources.get::>().unwrap(); - for window_created_event in - self.window_created_event_reader.iter(&window_created_events) + for window_created_event in self + .window_created_event_reader + .iter(&window_created_events) { let window = windows .get(window_created_event.id) diff --git a/examples/systems.rs b/examples/systems.rs index 5768a16204..ed9ff556dd 100644 --- a/examples/systems.rs +++ b/examples/systems.rs @@ -41,7 +41,8 @@ fn closure_system() -> Box { println!("processed entity: {} {}", x.0, y.0); println!("ran {} times", counter); counter += 1; - }).into_system("closure_system") + }) + .into_system("closure_system") } // if you need more flexibility, you can define complex systems using the system builder diff --git a/src/prelude.rs b/src/prelude.rs index bfcc5f0914..50af78ac46 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -13,6 +13,7 @@ pub use crate::diagnostic::DiagnosticsPlugin; pub use crate::pbr::{entity::*, light::Light, material::StandardMaterial}; #[cfg(feature = "render")] pub use crate::render::{ + batch::AssetBatchers, draw_target, entity::*, mesh::{shape, Mesh}, @@ -25,7 +26,6 @@ pub use crate::render::{ RenderGraph, }, render_resource::resource_name, - batch::AssetBatchers, shader::{Shader, ShaderDefSuffixProvider, ShaderStage, ShaderStages}, texture::{Texture, TextureType}, ActiveCamera, ActiveCamera2d, Camera, CameraType, Color, ColorSource, Renderable, @@ -38,24 +38,26 @@ pub use crate::ui::{entity::*, Anchors, Margins, Node}; pub use crate::window::{Window, WindowDescriptor, WindowPlugin, Windows}; pub use crate::{ app::{ - stage, App, AppBuilder, AppPlugin, EntityArchetype, EventReader, Events, GetEventReader, System + stage, App, AppBuilder, AppPlugin, EntityArchetype, EventReader, Events, GetEventReader, + System, }, math::{self, Mat3, Mat4, Quat, Vec2, Vec3, Vec4}, AddDefaultPlugins, }; pub use legion::{ - command::CommandBuffer, borrow::{Ref, RefMut}, + command::CommandBuffer, entity::Entity, event::Event as LegionEvent, filter::filter_fns::*, query::{IntoQuery, Query, Read, Tagged, TryRead, TryWrite, Write}, systems::{ bit_set::BitSet, - resource::{ResourceSet, Resources, PreparedRead as Resource, PreparedWrite as ResourceMut}, + resource::{ + PreparedRead as Resource, PreparedWrite as ResourceMut, ResourceSet, Resources, + }, schedule::{Executor, Runnable, Schedulable, Schedule}, - SubWorld, SystemBuilder, - IntoSystem + IntoSystem, SubWorld, SystemBuilder, }, world::{Universe, World}, };