From d13864781873428e7548e1686ae0efce261b3741 Mon Sep 17 00:00:00 2001 From: "Victor \"multun\" Collod" Date: Sat, 15 Aug 2020 20:27:41 -0700 Subject: [PATCH] enforce cargo fmt --check --- .github/workflows/rust.yml | 12 +++++++ crates/bevy_app/src/event.rs | 2 +- crates/bevy_asset/src/handle.rs | 2 +- crates/bevy_asset/src/lib.rs | 4 +-- crates/bevy_asset/src/loader.rs | 2 +- crates/bevy_core/src/float_ord.rs | 2 +- .../src/print_diagnostics_plugin.rs | 2 +- crates/bevy_ecs/hecs/examples/format.rs | 4 ++- .../bevy_ecs/src/resource/resource_query.rs | 2 +- crates/bevy_ecs/src/resource/resources.rs | 4 +-- .../src/schedule/parallel_executor.rs | 32 ++++++++++--------- crates/bevy_ecs/src/system/mod.rs | 4 +-- crates/bevy_ecs/src/system/system.rs | 4 +-- crates/bevy_input/src/keyboard.rs | 2 +- crates/bevy_input/src/lib.rs | 4 +-- crates/bevy_input/src/mouse.rs | 2 +- crates/bevy_pbr/src/render_graph/mod.rs | 11 ++++--- .../src/impl_property/impl_property_std.rs | 2 +- crates/bevy_render/src/camera/projection.rs | 2 +- .../src/camera/visible_entities.rs | 2 +- crates/bevy_render/src/mesh/mesh.rs | 6 ++-- .../src/pipeline/pipeline_compiler.rs | 4 +-- .../src/pipeline/state_descriptors.rs | 2 +- .../src/render_graph/nodes/pass_node.rs | 11 ++++--- .../nodes/render_resources_node.rs | 2 +- .../render_resource_bindings.rs | 2 +- crates/bevy_render/src/shader/shader.rs | 2 +- .../bevy_render/src/shader/shader_reflect.rs | 4 +-- .../src/texture/hdr_texture_loader.rs | 2 +- crates/bevy_ron/src/ser/mod.rs | 6 ++-- crates/bevy_scene/src/scene.rs | 5 ++- crates/bevy_scene/src/scene_spawner.rs | 5 ++- crates/bevy_text/src/draw.rs | 3 +- crates/bevy_ui/src/widget/text.rs | 6 ++-- .../renderer/wgpu_render_resource_context.rs | 8 +++-- examples/3d/3d_scene.rs | 5 ++- examples/3d/load_model.rs | 4 ++- examples/shader/shader_custom_material.rs | 2 +- examples/shader/shader_defs.rs | 2 +- rustfmt.toml | 3 +- src/lib.rs | 2 +- src/prelude.rs | 8 ++--- 42 files changed, 114 insertions(+), 81 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e57ebcef489a3..cceafa0dbcda9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,14 +17,26 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 with: toolchain: stable override: true + + - uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + components: rustfmt + - name: Install alsa run: sudo apt-get install libasound2-dev + - name: Build run: cargo check + + - name: Check the format + run: cargo +nightly fmt --all -- --check + - name: Run tests run: cargo test --workspace diff --git a/crates/bevy_app/src/event.rs b/crates/bevy_app/src/event.rs index bb197c696628b..8a907cc38ec73 100644 --- a/crates/bevy_app/src/event.rs +++ b/crates/bevy_app/src/event.rs @@ -82,7 +82,7 @@ fn map_instance_event(event_instance: &EventInstance) -> &T { &event_instance.event } -/// Reads events of type `T` in order and tracks which events have already been read. +/// Reads events of type `T` in order and tracks which events have already been read. pub struct EventReader { last_event_count: usize, _marker: PhantomData, diff --git a/crates/bevy_asset/src/handle.rs b/crates/bevy_asset/src/handle.rs index b60604d30e88f..01b43df487b95 100644 --- a/crates/bevy_asset/src/handle.rs +++ b/crates/bevy_asset/src/handle.rs @@ -24,7 +24,7 @@ impl HandleId { /// A handle into a specific Asset of type `T` /// -/// Handles contain a unique id that corresponds to a specific asset in the [Assets](crate::Assets) collection. +/// Handles contain a unique id that corresponds to a specific asset in the [Assets](crate::Assets) collection. #[derive(Properties)] pub struct Handle where diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index 8dd3635bcf213..b2751a37fee1e 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -1,7 +1,7 @@ -#[cfg(feature = "filesystem_watcher")] -mod filesystem_watcher; mod asset_server; mod assets; +#[cfg(feature = "filesystem_watcher")] +mod filesystem_watcher; mod handle; mod load_request; mod loader; diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs index 6b4a0c15332ce..e0dda22fbe8a6 100644 --- a/crates/bevy_asset/src/loader.rs +++ b/crates/bevy_asset/src/loader.rs @@ -53,7 +53,7 @@ impl AssetChannel { } } -/// Reads [AssetResult]s from an [AssetChannel] and updates the [Assets] collection and [LoadState] accordingly +/// Reads [AssetResult]s from an [AssetChannel] and updates the [Assets] collection and [LoadState] accordingly pub fn update_asset_storage_system( asset_channel: Res>, asset_server: Res, diff --git a/crates/bevy_core/src/float_ord.rs b/crates/bevy_core/src/float_ord.rs index 7e55e8db1e3cc..29d1545cdbbba 100644 --- a/crates/bevy_core/src/float_ord.rs +++ b/crates/bevy_core/src/float_ord.rs @@ -7,7 +7,7 @@ use std::{ /// A wrapper type that enables ordering floats. This is a work around for the famous "rust float ordering" problem. /// By using it, you acknowledge that sorting NaN is undefined according to spec. This implementation treats NaN as the -/// "smallest" float. +/// "smallest" float. #[derive(Debug, Copy, Clone, PartialOrd)] pub struct FloatOrd(pub f32); diff --git a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs index ad0ee8198bbfc..9409485e151e4 100644 --- a/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs +++ b/crates/bevy_diagnostic/src/print_diagnostics_plugin.rs @@ -4,7 +4,7 @@ use bevy_core::{Time, Timer}; use bevy_ecs::{IntoQuerySystem, Res, ResMut}; use std::time::Duration; -/// An App Plugin that prints diagnostics to the console +/// An App Plugin that prints diagnostics to the console pub struct PrintDiagnosticsPlugin { pub debug: bool, pub wait_duration: Duration, diff --git a/crates/bevy_ecs/hecs/examples/format.rs b/crates/bevy_ecs/hecs/examples/format.rs index 2dd33cbb60b85..942c4eaa9891b 100644 --- a/crates/bevy_ecs/hecs/examples/format.rs +++ b/crates/bevy_ecs/hecs/examples/format.rs @@ -4,7 +4,9 @@ //! also be useful for serialization, or other row-oriented generic operations. fn format_entity(entity: bevy_hecs::EntityRef<'_>) -> String { - fn fmt(entity: bevy_hecs::EntityRef<'_>) -> Option { + fn fmt( + entity: bevy_hecs::EntityRef<'_>, + ) -> Option { Some(entity.get::()?.to_string()) } diff --git a/crates/bevy_ecs/src/resource/resource_query.rs b/crates/bevy_ecs/src/resource/resource_query.rs index 0a48022d14309..bae6498ce8fc7 100644 --- a/crates/bevy_ecs/src/resource/resource_query.rs +++ b/crates/bevy_ecs/src/resource/resource_query.rs @@ -3,12 +3,12 @@ use crate::{ system::{SystemId, TypeAccess}, Resource, ResourceIndex, }; +use bevy_hecs::smaller_tuples_too; use core::{ any::TypeId, ops::{Deref, DerefMut}, ptr::NonNull, }; -use bevy_hecs::smaller_tuples_too; use std::marker::PhantomData; /// Shared borrow of a Resource diff --git a/crates/bevy_ecs/src/resource/resources.rs b/crates/bevy_ecs/src/resource/resources.rs index 8495e9c58cf63..f0561ef9973c7 100644 --- a/crates/bevy_ecs/src/resource/resources.rs +++ b/crates/bevy_ecs/src/resource/resources.rs @@ -1,7 +1,7 @@ use super::{FetchResource, ResourceQuery}; use crate::system::SystemId; -use core::any::TypeId; use bevy_hecs::{Archetype, Ref, RefMut, TypeInfo}; +use core::any::TypeId; use std::{collections::HashMap, ptr::NonNull}; /// A Resource type @@ -19,7 +19,7 @@ pub enum ResourceIndex { System(SystemId), } -/// A collection of resource instances identified by their type. +/// A collection of resource instances identified by their type. #[derive(Default)] pub struct Resources { pub(crate) resource_data: HashMap, diff --git a/crates/bevy_ecs/src/schedule/parallel_executor.rs b/crates/bevy_ecs/src/schedule/parallel_executor.rs index df32b16bd47d5..db51e293334c4 100644 --- a/crates/bevy_ecs/src/schedule/parallel_executor.rs +++ b/crates/bevy_ecs/src/schedule/parallel_executor.rs @@ -3,9 +3,9 @@ use crate::{ resource::Resources, system::{ArchetypeAccess, System, ThreadLocalExecution, TypeAccess}, }; +use bevy_hecs::{ArchetypesGeneration, World}; use crossbeam_channel::{Receiver, Sender}; use fixedbitset::FixedBitSet; -use bevy_hecs::{ArchetypesGeneration, World}; use rayon::ScopeFifo; use std::{ ops::Range, @@ -68,7 +68,6 @@ impl ParallelExecutor { } } - /// This can be added as an app resource to control the global `rayon::ThreadPool` used by ecs. // Dev internal note: We cannot directly expose a ThreadPoolBuilder here as it does not implement Send and Sync. #[derive(Debug, Default, Clone)] @@ -360,19 +359,22 @@ impl ExecutorStage { self.running_systems.clear(); let mut run_ready_result = RunReadyResult::Ok; - let run_ready_system_index_range = if let Some(index) = self - .thread_local_system_indices - .get(0) - { - // if there is an upcoming thread local system, run up to (and including) it - 0..(*index + 1) - } else { - // if there are no upcoming thread local systems, run everything right now - 0..systems.len() - }; + let run_ready_system_index_range = + if let Some(index) = self.thread_local_system_indices.get(0) { + // if there is an upcoming thread local system, run up to (and including) it + 0..(*index + 1) + } else { + // if there are no upcoming thread local systems, run everything right now + 0..systems.len() + }; rayon::scope_fifo(|scope| { - run_ready_result = - self.run_ready_systems(systems, RunReadyType::Range(run_ready_system_index_range), scope, world, resources); + run_ready_result = self.run_ready_systems( + systems, + RunReadyType::Range(run_ready_system_index_range), + scope, + world, + resources, + ); }); loop { // if all systems in the stage are finished, break out of the loop @@ -442,8 +444,8 @@ mod tests { system::{IntoQuerySystem, IntoThreadLocalSystem, Query}, Commands, }; - use fixedbitset::FixedBitSet; use bevy_hecs::{Entity, World}; + use fixedbitset::FixedBitSet; use std::sync::{Arc, Mutex}; #[derive(Default)] diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index ea15404f59bca..e9441684f0879 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -2,12 +2,12 @@ mod commands; mod into_system; #[cfg(feature = "profiler")] mod profiler; -mod system; mod query; +mod system; pub use commands::*; pub use into_system::*; #[cfg(feature = "profiler")] pub use profiler::*; -pub use system::*; pub use query::*; +pub use system::*; diff --git a/crates/bevy_ecs/src/system/system.rs b/crates/bevy_ecs/src/system/system.rs index c19bbf0959c12..7eee2f257acd3 100644 --- a/crates/bevy_ecs/src/system/system.rs +++ b/crates/bevy_ecs/src/system/system.rs @@ -1,6 +1,6 @@ use crate::resource::Resources; -use fixedbitset::FixedBitSet; use bevy_hecs::{Access, Query, World}; +use fixedbitset::FixedBitSet; use std::{any::TypeId, borrow::Cow, collections::HashSet}; /// Determines the strategy used to run the `run_thread_local` function in a [System] @@ -19,7 +19,7 @@ impl SystemId { } } -/// An ECS system that can be added to a [Schedule](crate::Schedule) +/// An ECS system that can be added to a [Schedule](crate::Schedule) pub trait System: Send + Sync { fn name(&self) -> Cow<'static, str>; fn id(&self) -> SystemId; diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs index 9fa037312a092..0763c5d3b8112 100644 --- a/crates/bevy_input/src/keyboard.rs +++ b/crates/bevy_input/src/keyboard.rs @@ -1,6 +1,6 @@ use crate::Input; use bevy_app::prelude::*; -use bevy_ecs::{Res, ResMut, Local}; +use bevy_ecs::{Local, Res, ResMut}; /// A key input event from a keyboard device #[derive(Debug, Clone)] diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs index 2eac1dcbb5794..fdfe65e17d332 100644 --- a/crates/bevy_input/src/lib.rs +++ b/crates/bevy_input/src/lib.rs @@ -11,9 +11,7 @@ pub mod prelude { use bevy_app::prelude::*; use keyboard::{keyboard_input_system, KeyCode, KeyboardInput}; -use mouse::{ - mouse_button_input_system, MouseButton, MouseButtonInput, MouseMotion, -}; +use mouse::{mouse_button_input_system, MouseButton, MouseButtonInput, MouseMotion}; use bevy_ecs::IntoQuerySystem; diff --git a/crates/bevy_input/src/mouse.rs b/crates/bevy_input/src/mouse.rs index e47ebdbe96404..26376b155fd45 100644 --- a/crates/bevy_input/src/mouse.rs +++ b/crates/bevy_input/src/mouse.rs @@ -1,7 +1,7 @@ use super::keyboard::ElementState; use crate::Input; use bevy_app::prelude::{EventReader, Events}; -use bevy_ecs::{Res, ResMut, Local}; +use bevy_ecs::{Local, Res, ResMut}; use bevy_math::Vec2; /// A mouse button input event diff --git a/crates/bevy_pbr/src/render_graph/mod.rs b/crates/bevy_pbr/src/render_graph/mod.rs index 130c86f554858..89899731d01bb 100644 --- a/crates/bevy_pbr/src/render_graph/mod.rs +++ b/crates/bevy_pbr/src/render_graph/mod.rs @@ -16,6 +16,7 @@ pub mod uniform { pub const LIGHTS: &str = "Lights"; } +use crate::prelude::StandardMaterial; use bevy_asset::Assets; use bevy_ecs::Resources; use bevy_render::{ @@ -24,7 +25,6 @@ use bevy_render::{ shader::Shader, }; use bevy_transform::prelude::Transform; -use crate::prelude::StandardMaterial; pub(crate) fn add_pbr_graph(graph: &mut RenderGraph, resources: &Resources) { graph.add_system_node(node::TRANSFORM, RenderResourcesNode::::new(true)); @@ -41,10 +41,13 @@ pub(crate) fn add_pbr_graph(graph: &mut RenderGraph, resources: &Resources) { ); // TODO: replace these with "autowire" groups - graph.add_node_edge(node::STANDARD_MATERIAL, base::node::MAIN_PASS) + graph + .add_node_edge(node::STANDARD_MATERIAL, base::node::MAIN_PASS) .unwrap(); - graph.add_node_edge(node::TRANSFORM, base::node::MAIN_PASS) + graph + .add_node_edge(node::TRANSFORM, base::node::MAIN_PASS) .unwrap(); - graph.add_node_edge(node::LIGHTS, base::node::MAIN_PASS) + graph + .add_node_edge(node::LIGHTS, base::node::MAIN_PASS) .unwrap(); } diff --git a/crates/bevy_property/src/impl_property/impl_property_std.rs b/crates/bevy_property/src/impl_property/impl_property_std.rs index e0f3656dd1fcd..fe3dfc40dd9ca 100644 --- a/crates/bevy_property/src/impl_property/impl_property_std.rs +++ b/crates/bevy_property/src/impl_property/impl_property_std.rs @@ -68,7 +68,7 @@ where if let Some(properties) = value.as_properties() { let len = properties.prop_len(); self.resize_with(len, || T::default()); - + if properties.property_type() != self.property_type() { panic!( "Properties type mismatch. This type is {:?} but the applied type is {:?}", diff --git a/crates/bevy_render/src/camera/projection.rs b/crates/bevy_render/src/camera/projection.rs index 413b39f048012..f560045217675 100644 --- a/crates/bevy_render/src/camera/projection.rs +++ b/crates/bevy_render/src/camera/projection.rs @@ -1,7 +1,7 @@ +use super::DepthCalculation; use bevy_math::Mat4; use bevy_property::{Properties, Property}; use serde::{Deserialize, Serialize}; -use super::DepthCalculation; pub trait CameraProjection { fn get_projection_matrix(&self) -> Mat4; diff --git a/crates/bevy_render/src/camera/visible_entities.rs b/crates/bevy_render/src/camera/visible_entities.rs index 09ba77dffd555..a7c2b3da59fd2 100644 --- a/crates/bevy_render/src/camera/visible_entities.rs +++ b/crates/bevy_render/src/camera/visible_entities.rs @@ -2,8 +2,8 @@ use super::{Camera, DepthCalculation}; use crate::Draw; use bevy_core::FloatOrd; use bevy_ecs::{Entity, Query}; -use bevy_transform::prelude::Transform; use bevy_property::Properties; +use bevy_transform::prelude::Transform; #[derive(Debug)] pub struct VisibleEntity { diff --git a/crates/bevy_render/src/mesh/mesh.rs b/crates/bevy_render/src/mesh/mesh.rs index 958f423f9f1e0..439468b3673c3 100644 --- a/crates/bevy_render/src/mesh/mesh.rs +++ b/crates/bevy_render/src/mesh/mesh.rs @@ -421,9 +421,7 @@ pub mod shape { let points = raw_points .iter() - .map(|&p| { - (p * sphere.radius).into() - }) + .map(|&p| (p * sphere.radius).into()) .collect::>(); let normals = raw_points @@ -447,7 +445,7 @@ pub mod shape { VertexAttribute::normal(normals), VertexAttribute::uv(uvs), ], - indices: Some(indices) + indices: Some(indices), } } } diff --git a/crates/bevy_render/src/pipeline/pipeline_compiler.rs b/crates/bevy_render/src/pipeline/pipeline_compiler.rs index c72584a941e00..6f636d6329756 100644 --- a/crates/bevy_render/src/pipeline/pipeline_compiler.rs +++ b/crates/bevy_render/src/pipeline/pipeline_compiler.rs @@ -4,10 +4,10 @@ use crate::{ shader::{Shader, ShaderSource}, }; use bevy_asset::{Assets, Handle}; +use bevy_property::{Properties, Property}; use once_cell::sync::Lazy; +use serde::{Deserialize, Serialize}; use std::collections::{HashMap, HashSet}; -use bevy_property::{Properties, Property}; -use serde::{Serialize, Deserialize}; #[derive(Clone, Eq, PartialEq, Debug, Properties)] pub struct PipelineSpecialization { pub shader_specialization: ShaderSpecialization, diff --git a/crates/bevy_render/src/pipeline/state_descriptors.rs b/crates/bevy_render/src/pipeline/state_descriptors.rs index ca3f90c811ae7..92f6b396db6ee 100644 --- a/crates/bevy_render/src/pipeline/state_descriptors.rs +++ b/crates/bevy_render/src/pipeline/state_descriptors.rs @@ -1,6 +1,6 @@ use crate::texture::TextureFormat; -use serde::{Serialize, Deserialize}; use bevy_property::Property; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug)] pub struct DepthStencilStateDescriptor { diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs index 7dc17568fbeec..56089d8e9c3e8 100644 --- a/crates/bevy_render/src/render_graph/nodes/pass_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/pass_node.rs @@ -3,8 +3,8 @@ use crate::{ draw::{Draw, RenderCommand}, pass::{ClearColor, LoadOp, PassDescriptor, TextureAttachment}, pipeline::{ - BindGroupDescriptor, BindType, BindingDescriptor, PipelineDescriptor, UniformProperty, - BindingShaderStage, + BindGroupDescriptor, BindType, BindingDescriptor, BindingShaderStage, PipelineDescriptor, + UniformProperty, }, render_graph::{Node, ResourceSlotInfo, ResourceSlots}, renderer::{ @@ -12,7 +12,7 @@ use crate::{ }, }; use bevy_asset::{Assets, Handle}; -use bevy_ecs::{Resources, World, HecsQuery}; +use bevy_ecs::{HecsQuery, Resources, World}; use std::marker::PhantomData; struct CameraInfo { @@ -136,8 +136,9 @@ impl Node for PassNode { TextureAttachment::Id(input.get(input_index).unwrap().get_texture().unwrap()); } if let Some(input_index) = self.color_resolve_target_indices[i] { - color_attachment.resolve_target = - Some(TextureAttachment::Id(input.get(input_index).unwrap().get_texture().unwrap())); + color_attachment.resolve_target = Some(TextureAttachment::Id( + input.get(input_index).unwrap().get_texture().unwrap(), + )); } } diff --git a/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs b/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs index e90523a8b865e..530027d306c62 100644 --- a/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs @@ -660,7 +660,7 @@ fn asset_render_resources_node_system( for (asset_handle, draw, mut render_pipelines) in &mut query.iter() { if !draw.is_visible { - continue + continue; } if let Some(asset_bindings) = asset_render_resource_bindings.get(*asset_handle) { render_pipelines.bindings.extend(asset_bindings); diff --git a/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs b/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs index ad12252a44ac6..15365311072c7 100644 --- a/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs +++ b/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs @@ -261,7 +261,7 @@ impl Default for RenderResourceBindingsId { #[cfg(test)] mod tests { use super::*; - use crate::pipeline::{BindType, BindingDescriptor, UniformProperty, BindingShaderStage}; + use crate::pipeline::{BindType, BindingDescriptor, BindingShaderStage, UniformProperty}; #[test] fn test_bind_groups() { diff --git a/crates/bevy_render/src/shader/shader.rs b/crates/bevy_render/src/shader/shader.rs index 9196259f60c86..f963c0c90aa55 100644 --- a/crates/bevy_render/src/shader/shader.rs +++ b/crates/bevy_render/src/shader/shader.rs @@ -56,7 +56,7 @@ impl ShaderSource { } } -/// A shader, as defined by its [ShaderSource] and [ShaderStage] +/// A shader, as defined by its [ShaderSource] and [ShaderStage] #[derive(Clone, Debug)] pub struct Shader { pub source: ShaderSource, diff --git a/crates/bevy_render/src/shader/shader_reflect.rs b/crates/bevy_render/src/shader/shader_reflect.rs index c71b4dcb92dcd..86bc07c611832 100644 --- a/crates/bevy_render/src/shader/shader_reflect.rs +++ b/crates/bevy_render/src/shader/shader_reflect.rs @@ -1,7 +1,7 @@ use crate::{ pipeline::{ - BindGroupDescriptor, BindType, BindingDescriptor, InputStepMode, UniformProperty, - VertexAttributeDescriptor, VertexBufferDescriptor, VertexFormat, BindingShaderStage, + BindGroupDescriptor, BindType, BindingDescriptor, BindingShaderStage, InputStepMode, + UniformProperty, VertexAttributeDescriptor, VertexBufferDescriptor, VertexFormat, }, texture::{TextureComponentType, TextureViewDimension}, }; diff --git a/crates/bevy_render/src/texture/hdr_texture_loader.rs b/crates/bevy_render/src/texture/hdr_texture_loader.rs index a1bb99c491c0d..c9b4628a99f93 100644 --- a/crates/bevy_render/src/texture/hdr_texture_loader.rs +++ b/crates/bevy_render/src/texture/hdr_texture_loader.rs @@ -4,7 +4,7 @@ use bevy_asset::AssetLoader; use bevy_math::Vec2; use std::path::Path; -/// Loads HDR textures as Texture assets +/// Loads HDR textures as Texture assets #[derive(Clone, Default)] pub struct HdrTextureLoader; diff --git a/crates/bevy_ron/src/ser/mod.rs b/crates/bevy_ron/src/ser/mod.rs index f76f595fc5a84..d3b8c7ab5fa81 100644 --- a/crates/bevy_ron/src/ser/mod.rs +++ b/crates/bevy_ron/src/ser/mod.rs @@ -1,8 +1,10 @@ use serde::{ser, Deserialize, Serialize}; use std::io; -use crate::error::{Error, Result}; -use crate::extensions::Extensions; +use crate::{ + error::{Error, Result}, + extensions::Extensions, +}; mod value; diff --git a/crates/bevy_scene/src/scene.rs b/crates/bevy_scene/src/scene.rs index 3300bc8b0b86a..32dab7b9babea 100644 --- a/crates/bevy_scene/src/scene.rs +++ b/crates/bevy_scene/src/scene.rs @@ -44,7 +44,10 @@ impl Scene { } // TODO: move to AssetSaver when it is implemented - pub fn serialize_ron(&self, registry: &PropertyTypeRegistry) -> Result { + pub fn serialize_ron( + &self, + registry: &PropertyTypeRegistry, + ) -> Result { serialize_ron(SceneSerializer::new(self, registry)) } } diff --git a/crates/bevy_scene/src/scene_spawner.rs b/crates/bevy_scene/src/scene_spawner.rs index ed15d22c822cb..c4f659fb868b4 100644 --- a/crates/bevy_scene/src/scene_spawner.rs +++ b/crates/bevy_scene/src/scene_spawner.rs @@ -113,7 +113,6 @@ impl SceneSpawner { component_registration.apply_component_to_entity(world, entity, component); } } - } else { world.spawn_as_entity(entity, (1,)); for component in scene_entity.components.iter() { @@ -122,7 +121,8 @@ impl SceneSpawner { .ok_or_else(|| SceneSpawnError::UnregisteredComponent { type_name: component.type_name.to_string(), })?; - component_registration.add_component_to_entity(world, resources, entity, component); + component_registration + .add_component_to_entity(world, resources, entity, component); } } } @@ -209,7 +209,6 @@ pub fn scene_spawner_system(world: &mut World, resources: &mut Resources) { } } - scene_spawner.load_queued_scenes(world, resources).unwrap(); scene_spawner.spawn_queued_scenes(world, resources).unwrap(); scene_spawner diff --git a/crates/bevy_text/src/draw.rs b/crates/bevy_text/src/draw.rs index 52fc7127eff4c..a6c8e7e6d439f 100644 --- a/crates/bevy_text/src/draw.rs +++ b/crates/bevy_text/src/draw.rs @@ -7,10 +7,11 @@ use bevy_render::{ draw::{Draw, DrawContext, DrawError, Drawable}, mesh, pipeline::PipelineSpecialization, + prelude::Msaa, renderer::{ AssetRenderResourceBindings, BindGroup, BufferUsage, RenderResourceBindings, RenderResourceId, - }, prelude::Msaa, + }, }; use bevy_sprite::{TextureAtlas, TextureAtlasSprite}; diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs index 6bc23a6880071..7cad33605be55 100644 --- a/crates/bevy_ui/src/widget/text.rs +++ b/crates/bevy_ui/src/widget/text.rs @@ -4,8 +4,9 @@ use bevy_ecs::{Changed, Query, Res, ResMut}; use bevy_math::{Size, Vec3}; use bevy_render::{ draw::{Draw, DrawContext, Drawable}, + prelude::Msaa, renderer::{AssetRenderResourceBindings, RenderResourceBindings}, - texture::Texture, prelude::Msaa, + texture::Texture, }; use bevy_sprite::TextureAtlas; use bevy_text::{DrawableText, Font, FontAtlasSet, TextStyle}; @@ -59,7 +60,8 @@ pub fn draw_text_system( mut query: Query<(&mut Draw, &Text, &Node, &Transform)>, ) { for (mut draw, text, node, transform) in &mut query.iter() { - let position = Vec3::from(transform.value.w_axis().truncate()) - (node.size / 2.0).extend(0.0); + let position = + Vec3::from(transform.value.w_axis().truncate()) - (node.size / 2.0).extend(0.0); let mut drawable_text = DrawableText { font: fonts.get(&text.font).unwrap(), 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 26ab64743ef92..f32696b0b4508 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -5,7 +5,9 @@ use crate::{ use bevy_asset::{Assets, Handle, HandleUntyped}; use bevy_render::{ - pipeline::{BindGroupDescriptor, BindGroupDescriptorId, BindingShaderStage, PipelineDescriptor}, + pipeline::{ + BindGroupDescriptor, BindGroupDescriptorId, BindingShaderStage, PipelineDescriptor, + }, renderer::{ BindGroup, BufferId, BufferInfo, RenderResourceBinding, RenderResourceContext, RenderResourceId, SamplerId, TextureId, @@ -113,7 +115,9 @@ impl WgpuRenderResourceContext { .bindings .iter() .map(|binding| { - let shader_stage = if binding.shader_stage == BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT { + let shader_stage = if binding.shader_stage + == BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT + { wgpu::ShaderStage::VERTEX | wgpu::ShaderStage::FRAGMENT } else if binding.shader_stage == BindingShaderStage::VERTEX { wgpu::ShaderStage::VERTEX diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs index a471ace836631..3f219d087d686 100644 --- a/examples/3d/3d_scene.rs +++ b/examples/3d/3d_scene.rs @@ -31,7 +31,10 @@ fn setup( }) // sphere .spawn(PbrComponents { - mesh: meshes.add(Mesh::from(shape::Icosphere { subdivisions: 4, radius: 0.5 })), + mesh: meshes.add(Mesh::from(shape::Icosphere { + subdivisions: 4, + radius: 0.5, + })), material: materials.add(Color::rgb(0.1, 0.4, 0.8).into()), translation: Translation::new(1.5, 1.5, 1.5), ..Default::default() diff --git a/examples/3d/load_model.rs b/examples/3d/load_model.rs index f759c5e18b561..6781b44a402d4 100644 --- a/examples/3d/load_model.rs +++ b/examples/3d/load_model.rs @@ -18,7 +18,9 @@ fn setup( // mesh .spawn(PbrComponents { // load the mesh - mesh: asset_server.load("assets/models/monkey/Monkey.gltf").unwrap(), + mesh: asset_server + .load("assets/models/monkey/Monkey.gltf") + .unwrap(), // create a material for the mesh material: materials.add(Color::rgb(0.5, 0.4, 0.3).into()), ..Default::default() diff --git a/examples/shader/shader_custom_material.rs b/examples/shader/shader_custom_material.rs index 5ef191309bd61..f672eca94ce10 100644 --- a/examples/shader/shader_custom_material.rs +++ b/examples/shader/shader_custom_material.rs @@ -68,7 +68,7 @@ fn setup( AssetRenderResourcesNode::::new(true), ); - // Add a Render Graph edge connecting our new "my_material" node to the main pass node. This ensures "my_material" runs before the main pass + // Add a Render Graph edge connecting our new "my_material" node to the main pass node. This ensures "my_material" runs before the main pass render_graph .add_node_edge("my_material", base::node::MAIN_PASS) .unwrap(); diff --git a/examples/shader/shader_defs.rs b/examples/shader/shader_defs.rs index d6c5704692988..79b10cf19e751 100644 --- a/examples/shader/shader_defs.rs +++ b/examples/shader/shader_defs.rs @@ -80,7 +80,7 @@ fn setup( AssetRenderResourcesNode::::new(true), ); - // Add a Render Graph edge connecting our new "my_material" node to the main pass node. This ensures "my_material" runs before the main pass + // Add a Render Graph edge connecting our new "my_material" node to the main pass node. This ensures "my_material" runs before the main pass render_graph .add_node_edge("my_material", base::node::MAIN_PASS) .unwrap(); diff --git a/rustfmt.toml b/rustfmt.toml index ffdf397ed2685..94853d522f551 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,5 @@ +unstable_features = true merge_imports = true use_field_init_shorthand = true reorder_impl_items = true -newline_style = "Unix" \ No newline at end of file +newline_style = "Unix" diff --git a/src/lib.rs b/src/lib.rs index e26312234d045..ae29f1b089ca6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -69,4 +69,4 @@ pub use bevy_gltf as gltf; pub use bevy_winit as winit; #[cfg(feature = "bevy_wgpu")] -pub use bevy_wgpu as wgpu; \ No newline at end of file +pub use bevy_wgpu as wgpu; diff --git a/src/prelude.rs b/src/prelude.rs index 0963070ef21a0..6996f1d07b70d 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -1,8 +1,8 @@ pub use crate::{ - app::prelude::*, asset::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, + app::prelude::*, asset::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, }; #[cfg(feature = "bevy_audio")]