ci

robtfm · Aug 18, 2024 · c491767 · c491767
1 parent 340d03a
commit c491767
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 22 deletions.
diff --git a/crates/bevy_animation/src/transition.rs b/crates/bevy_animation/src/transition.rs
@@ -96,7 +96,7 @@ impl AnimationTransitions {
         // Otherwise the transition ending would incorrectly stop the new animation.
         self.transitions
             .retain(|transition| transition.animation != new_animation);
-        
+
         player.start(new_animation)
     }
 
@@ -106,7 +106,7 @@ impl AnimationTransitions {
     }
 
     /// Iterator over animations currently being transitioned out
-    pub fn get_transitions(&self) -> impl Iterator<Item=&AnimationTransition> {
+    pub fn get_transitions(&self) -> impl Iterator<Item = &AnimationTransition> {
         self.transitions.iter()
     }
 }

diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs
@@ -949,9 +949,7 @@ impl<M: Material> RenderAsset for PreparedMaterial<M> {
             Err(AsBindGroupError::RetryNextUpdate) => {
                 Err(PrepareAssetError::RetryNextUpdate(material))
             }
-            Err(AsBindGroupError::InvalidData(msg)) => {
-                Err(PrepareAssetError::InvalidData(msg))
-            }
+            Err(AsBindGroupError::InvalidData(msg)) => Err(PrepareAssetError::InvalidData(msg)),
         }
     }
 }

diff --git a/crates/bevy_render/macros/src/as_bind_group.rs b/crates/bevy_render/macros/src/as_bind_group.rs
@@ -382,8 +382,8 @@ pub fn derive_as_bind_group(ast: syn::DeriveInput) -> Result<TokenStream> {
                                         return Err(#render_path::render_resource::AsBindGroupError::InvalidData(
                                             format!(
                                                 "binding index {}: no sampler for format `{:?}`", 
-                                                #binding_index, 
-                                                image.texture_format, 
+                                                #binding_index,
+                                                image.texture_format,
                                             )
                                         ));
                                     };
@@ -394,8 +394,8 @@ pub fn derive_as_bind_group(ast: syn::DeriveInput) -> Result<TokenStream> {
                                         return Err(#render_path::render_resource::AsBindGroupError::InvalidData(
                                             format!(
                                                 "binding index {}: image sampler type `{:?}` must be one of `{:?}`", 
-                                                #binding_index, 
-                                                sample_type, 
+                                                #binding_index,
+                                                sample_type,
                                                 #expected_samplers
                                             )
                                         ));

diff --git a/crates/bevy_render/src/render_asset.rs b/crates/bevy_render/src/render_asset.rs
@@ -9,7 +9,10 @@ use bevy_ecs::{
 };
 use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
 use bevy_render_macros::ExtractResource;
-use bevy_utils::{tracing::{debug, warn}, HashMap, HashSet};
+use bevy_utils::{
+    tracing::{debug, warn},
+    HashMap, HashSet,
+};
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -352,7 +355,10 @@ pub fn prepare_assets<A: RenderAsset>(
                 prepare_next_frame.assets.push((id, extracted_asset));
             }
             Err(PrepareAssetError::InvalidData(msg)) => {
-                warn!("Material2d<{}> Bind group contains invalid data: {msg}", std::any::type_name::<A>());
+                warn!(
+                    "Material2d<{}> Bind group contains invalid data: {msg}",
+                    std::any::type_name::<A>()
+                );
             }
         }
     }
@@ -387,7 +393,10 @@ pub fn prepare_assets<A: RenderAsset>(
                 prepare_next_frame.assets.push((id, extracted_asset));
             }
             Err(PrepareAssetError::InvalidData(msg)) => {
-                warn!("Material2d<{}> Bind group contains invalid data: {msg}", std::any::type_name::<A>());
+                warn!(
+                    "Material2d<{}> Bind group contains invalid data: {msg}",
+                    std::any::type_name::<A>()
+                );
             }
         }
     }

diff --git a/crates/bevy_render/src/render_resource/bind_group.rs b/crates/bevy_render/src/render_resource/bind_group.rs
@@ -353,7 +353,7 @@ pub enum AsBindGroupError {
     #[error("The bind group could not be generated")]
     RetryNextUpdate,
     #[error("The bindgroup data is invalid: {0}")]
-    InvalidData(String),    
+    InvalidData(String),
 }
 
 /// A prepared bind group returned as a result of [`AsBindGroup::as_bind_group`].

diff --git a/crates/bevy_render/src/texture/image_loader.rs b/crates/bevy_render/src/texture/image_loader.rs
@@ -100,7 +100,11 @@ impl AssetLoader for ImageLoader {
         let image_type = match settings.format {
             ImageFormatSetting::FromExtension => {
                 // use the file extension for the image type
-                let ext = load_context.path().extension().and_then(OsStr::to_str).unwrap_or("image");
+                let ext = load_context
+                    .path()
+                    .extension()
+                    .and_then(OsStr::to_str)
+                    .unwrap_or("image");
                 ImageType::Extension(ext)
             }
             ImageFormatSetting::Format(format) => ImageType::Format(format),

diff --git a/crates/bevy_sprite/src/mesh2d/material.rs b/crates/bevy_sprite/src/mesh2d/material.rs
@@ -508,9 +508,7 @@ impl<M: Material2d> RenderAsset for PreparedMaterial2d<M> {
             Err(AsBindGroupError::RetryNextUpdate) => {
                 Err(PrepareAssetError::RetryNextUpdate(material))
             }
-            Err(AsBindGroupError::InvalidData(msg)) => {
-                Err(PrepareAssetError::InvalidData(msg))
-            }
+            Err(AsBindGroupError::InvalidData(msg)) => Err(PrepareAssetError::InvalidData(msg)),
         }
     }
 }

diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs
@@ -54,7 +54,9 @@ use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use bevy_input::InputSystem;
 use bevy_render::{
-    camera::CameraUpdateSystem, view::{check_visibility, VisibilitySystems}, RenderApp
+    camera::CameraUpdateSystem,
+    view::{check_visibility, VisibilitySystems},
+    RenderApp,
 };
 use bevy_transform::TransformSystem;
 use layout::ui_surface::UiSurface;

diff --git a/crates/bevy_ui/src/render/ui_material_pipeline.rs b/crates/bevy_ui/src/render/ui_material_pipeline.rs
@@ -624,9 +624,7 @@ impl<M: UiMaterial> RenderAsset for PreparedUiMaterial<M> {
             Err(AsBindGroupError::RetryNextUpdate) => {
                 Err(PrepareAssetError::RetryNextUpdate(material))
             }
-            Err(AsBindGroupError::InvalidData(msg)) => {
-                Err(PrepareAssetError::InvalidData(msg))
-            }
+            Err(AsBindGroupError::InvalidData(msg)) => Err(PrepareAssetError::InvalidData(msg)),
         }
     }
 }

diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs
@@ -79,7 +79,10 @@ impl Node {
     /// Returns the logical pixel coordinates of the UI node, based on its [`GlobalTransform`].
     #[inline]
     pub fn logical_rect(&self, transform: &GlobalTransform) -> Rect {
-        Rect::from_center_size(transform.translation().truncate(), self.size().max(Vec2::ZERO))
+        Rect::from_center_size(
+            transform.translation().truncate(),
+            self.size().max(Vec2::ZERO),
+        )
     }
 
     /// Returns the physical pixel coordinates of the UI node, based on its [`GlobalTransform`] and the scale factor.