Run cargo fmt with nightly flags (#346)

djeedai · Jun 22, 2024 · 0938852 · 0938852
1 parent e4e5d25
commit 0938852
Show file tree

Hide file tree

Showing 43 changed files with 195 additions and 209 deletions.
diff --git a/examples/2d.rs b/examples/2d.rs
@@ -12,11 +12,10 @@ use bevy::{
     },
     sprite::{MaterialMesh2dBundle, Mesh2dHandle},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/activate.rs b/examples/activate.rs
@@ -18,11 +18,10 @@ use bevy::{
         camera::ScalingMode, render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin,
     },
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/billboard.rs b/examples/billboard.rs
@@ -37,11 +37,10 @@ use bevy::{
         camera::Projection, render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin,
     },
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/circle.rs b/examples/circle.rs
@@ -11,11 +11,10 @@ use bevy::{
     prelude::*,
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 mod texutils;
 
 use texutils::make_anim_img;

diff --git a/examples/expr.rs b/examples/expr.rs
@@ -12,11 +12,10 @@ use bevy::{
     log::LogPlugin,
     prelude::*,
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut app = App::default();
     app.add_plugins(

diff --git a/examples/firework.rs b/examples/firework.rs
@@ -23,11 +23,10 @@ use bevy::{
     log::LogPlugin,
     prelude::*,
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut app = App::default();
     app.add_plugins(

diff --git a/examples/force_field.rs b/examples/force_field.rs
@@ -20,11 +20,10 @@ use bevy::{
     prelude::*,
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/gradient.rs b/examples/gradient.rs
@@ -1,3 +1,5 @@
+use std::f32::consts::PI;
+
 use bevy::{
     core_pipeline::tonemapping::Tonemapping,
     log::LogPlugin,
@@ -6,11 +8,9 @@ use bevy::{
         render_resource::WgpuFeatures, settings::WgpuSettings, view::RenderLayers, RenderPlugin,
     },
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
-use std::f32::consts::PI;
-
-use bevy_hanabi::prelude::*;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();

diff --git a/examples/init.rs b/examples/init.rs
@@ -13,11 +13,10 @@ use bevy::{
     prelude::*,
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 #[derive(Component)]
 struct RotateSpeed(pub f32);
 

diff --git a/examples/instancing.rs b/examples/instancing.rs
@@ -10,12 +10,11 @@
 #![allow(dead_code)]
 
 use bevy::{core_pipeline::tonemapping::Tonemapping, log::LogPlugin, prelude::*};
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use rand::Rng;
 
-use bevy_hanabi::prelude::*;
-
 #[derive(Default, Resource)]
 struct InstanceManager {
     effect: Handle<EffectAsset>,

diff --git a/examples/lifetime.rs b/examples/lifetime.rs
@@ -17,11 +17,10 @@ use bevy::{
     prelude::*,
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/multicam.rs b/examples/multicam.rs
@@ -8,11 +8,10 @@ use bevy::{
     render::{camera::Viewport, view::RenderLayers},
     window::WindowResized,
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() {
     let mut app = App::default();
     app.add_plugins(

diff --git a/examples/ordering.rs b/examples/ordering.rs
@@ -14,7 +14,6 @@ use bevy::{
     log::LogPlugin,
     prelude::*,
 };
-
 use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;

diff --git a/examples/portal.rs b/examples/portal.rs
@@ -16,11 +16,10 @@ use bevy::{
     log::LogPlugin,
     prelude::*,
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut app = App::default();
     app.add_plugins(

diff --git a/examples/random.rs b/examples/random.rs
@@ -7,11 +7,10 @@ use bevy::{
     prelude::*,
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/ribbon.rs b/examples/ribbon.rs
@@ -7,7 +7,6 @@ use bevy::{
     math::vec3,
 };
 use bevy_hanabi::prelude::*;
-
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 

diff --git a/examples/spawn.rs b/examples/spawn.rs
@@ -7,11 +7,10 @@ use bevy::{
         RenderPlugin,
     },
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 /// Set this to `true` to enable WGPU downlevel constraints. This is disabled by
 /// default to prevent the example from failing to start on devices with a
 /// monitor resolution larger than the maximum resolution imposed by the

diff --git a/examples/spawn_on_command.rs b/examples/spawn_on_command.rs
@@ -17,11 +17,10 @@ use bevy::{
         RenderPlugin,
     },
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/visibility.rs b/examples/visibility.rs
@@ -18,11 +18,10 @@ use bevy::{
     prelude::*,
     render::{render_resource::WgpuFeatures, settings::WgpuSettings, RenderPlugin},
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut wgpu_settings = WgpuSettings::default();
     wgpu_settings

diff --git a/examples/worms.rs b/examples/worms.rs
@@ -10,11 +10,10 @@ use bevy::{
     math::{vec3, vec4},
     prelude::*,
 };
+use bevy_hanabi::prelude::*;
 #[cfg(feature = "examples_world_inspector")]
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 
-use bevy_hanabi::prelude::*;
-
 fn main() {
     let mut app = App::default();
     app.add_plugins(

diff --git a/gpu_tests/empty_effect.rs b/gpu_tests/empty_effect.rs
@@ -1,7 +1,6 @@
 //! Test that an empty (invalid) bundle doesn't produce any error.
 
 use bevy::{app::AppExit, core_pipeline::tonemapping::Tonemapping, log::LogPlugin, prelude::*};
-
 use bevy_hanabi::prelude::*;
 
 #[derive(Default, Resource)]

diff --git a/src/asset.rs b/src/asset.rs
@@ -1,10 +1,11 @@
+use std::ops::Deref;
+
 use bevy::{
     asset::{io::Reader, Asset, AssetLoader, AsyncReadExt, LoadContext},
     reflect::Reflect,
     utils::{default, thiserror::Error, BoxedFuture, HashSet},
 };
 use serde::{Deserialize, Serialize};
-use std::ops::Deref;
 
 use crate::{
     modifier::{Modifier, RenderModifier},
@@ -720,9 +721,8 @@ impl AssetLoader for EffectAssetLoader {
 mod tests {
     use ron::ser::PrettyConfig;
 
-    use crate::*;
-
     use super::*;
+    use crate::*;
 
     #[test]
     fn add_modifiers() {

diff --git a/src/attributes.rs b/src/attributes.rs
@@ -486,7 +486,7 @@ impl std::hash::Hash for AttributeInner {
 }
 
 macro_rules! declare_custom_attr_inner {
-    ($t: ident, $T: ty, $name: literal, $new_fn: ident) => {
+    ($t:ident, $T:ty, $name:literal, $new_fn:ident) => {
         pub const $t: &'static AttributeInner = &AttributeInner::new(
             Cow::Borrowed($name),
             Value::Vector(VectorValue::$new_fn(<$T>::ZERO)),
@@ -1289,9 +1289,7 @@ impl ParticleLayoutBuilder {
     ///
     /// ```
     /// # use bevy_hanabi::*;
-    /// let layout = ParticleLayout::new()
-    ///     .append(Attribute::POSITION)
-    ///     .build();
+    /// let layout = ParticleLayout::new().append(Attribute::POSITION).build();
     /// ```
     pub fn build(mut self) -> ParticleLayout {
         // Remove duplicates
@@ -1575,9 +1573,7 @@ impl ParticleLayout {
     ///
     /// ```
     /// # use bevy_hanabi::*;
-    /// let layout = ParticleLayout::new()
-    ///     .append(Attribute::SIZE)
-    ///     .build();
+    /// let layout = ParticleLayout::new().append(Attribute::SIZE).build();
     /// let has_size = layout.contains(Attribute::SIZE);
     /// assert!(has_size);
     /// ```
@@ -1610,11 +1606,11 @@ impl ParticleLayout {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     use bevy::reflect::TypeRegistration;
     use naga::{front::wgsl::Frontend, proc::Layouter};
 
+    use super::*;
+
     // Ensure the size and alignment of all types conforms to the WGSL spec by
     // querying naga as a reference.
     #[test]

diff --git a/src/bundle.rs b/src/bundle.rs
@@ -1,6 +1,7 @@
-use crate::{CompiledParticleEffect, EffectAsset, EffectProperties, ParticleEffect};
 use bevy::prelude::*;
 
+use crate::{CompiledParticleEffect, EffectAsset, EffectProperties, ParticleEffect};
+
 /// A component bundle for a particle effect.
 ///
 /// This bundle contains all necessary components for a [`ParticleEffect`] to

diff --git a/src/gradient.rs b/src/gradient.rs
@@ -1,10 +1,11 @@
+use std::hash::{Hash, Hasher};
+
 use bevy::{
     math::{Quat, Vec2, Vec3, Vec3A, Vec4},
     reflect::{FromReflect, Reflect},
     utils::FloatOrd,
 };
 use serde::{Deserialize, Serialize};
-use std::hash::{Hash, Hasher};
 
 /// Describes a type that can be linearly interpolated between two keys.
 ///
@@ -484,9 +485,8 @@ mod tests {
     use bevy::reflect::{ReflectRef, Struct};
     use rand::{distributions::Standard, prelude::Distribution, rngs::ThreadRng, thread_rng, Rng};
 
-    use crate::test_utils::*;
-
     use super::*;
+    use crate::test_utils::*;
 
     const RED: Vec4 = Vec4::new(1., 0., 0., 1.);
     const BLUE: Vec4 = Vec4::new(0., 0., 1., 1.);