Format + Clippy fixes

Author: StarArawn

src/context.rs

@@ -811,11 +811,11 @@ fn update_widgets(
                                             if widget_name != prev_widget_name {
                                                 // It doesn't matter we always need to remove state
                                                 remove_state.push(changed_entity.0);
-                                                if let Some(_) = tree.parent(*changed_entity) {
+                                                if tree.parent(*changed_entity).is_some() {
                                                     for child in
                                                         tree.down_iter_at(*changed_entity, false)
                                                     {
-                                                        info!(
+                                                        trace!(
                                                             "Removing AvsB children {}::{}",
                                                             entity_ref
                                                                 .get::<WidgetName>()
@@ -827,25 +827,25 @@ fn update_widgets(
                                                         if let Ok(order_tree) =
                                                             order_tree.try_read()
                                                         {
-                                                            if let Some(order_tree_parent) = order_tree
-                                                                .parent(*changed_entity) {
+                                                            if let Some(order_tree_parent) =
+                                                                order_tree.parent(*changed_entity)
+                                                            {
                                                                 'back_up: for sibling in order_tree
                                                                     .child_iter(order_tree_parent)
                                                                 {
-                                                                    dbg!(sibling, changed_entity);
                                                                     if sibling == *changed_entity {
                                                                         continue 'back_up;
                                                                     }
-                                                                    for child in
-                                                                        tree.down_iter_at(sibling, true)
-                                                                    {   
+                                                                    for child in tree
+                                                                        .down_iter_at(sibling, true)
+                                                                    {
                                                                         // Ignore self again.
-                                                                        dbg!(child);
                                                                         if child == *parent {
                                                                             continue;
                                                                         }
                                                                         if let Some(entity_ref) =
-                                                                            world.get_entity(child.0)
+                                                                            world
+                                                                                .get_entity(child.0)
                                                                         {
                                                                             if let Some(children) =
                                                                                 entity_ref
@@ -857,7 +857,7 @@ fn update_widgets(
                                                                                             .0,
                                                                                     )
                                                                                 {
-                                                                                    info!("Caught an entity that was marked as deleted but wasn't! {:?} in {:?}", changed_entity.0, child.0);
+                                                                                    trace!("Caught an entity that was marked as deleted but wasn't! {:?} in {:?}", changed_entity.0, child.0);
                                                                                     // Don't despawn changed entity because it exists as a child passed via props
                                                                                     should_delete =
                                                                                         false;
@@ -885,9 +885,10 @@ fn update_widgets(
                                 }
                             }
 
-                            for entity in remove_state.iter() { 
+                            for entity in remove_state.iter() {
                                 if let Some(state_entity) = widget_state.remove(*entity) {
-                                    if let Some(mut entity_mut) = world.get_entity_mut(state_entity) {
+                                    if let Some(mut entity_mut) = world.get_entity_mut(state_entity)
+                                    {
                                         entity_mut.remove_parent();
                                         entity_mut.despawn_recursive();
                                     }

src/context_entities.rs

@@ -30,7 +30,10 @@ impl ContextEntities {
         inner.insert(T::default().type_id(), context_entity);
     }
 
-    pub fn get_context_entity<T: Default + 'static>(&self, parent_id: Option<Entity>) -> Option<Entity> {
+    pub fn get_context_entity<T: Default + 'static>(
+        &self,
+        parent_id: Option<Entity>,
+    ) -> Option<Entity> {
         if !self.ce.contains_key(&parent_id) {
             return None;
         }

src/render/ui_pass.rs

@@ -4,7 +4,7 @@ use bevy::ecs::prelude::*;
 use bevy::prelude::{Color, Image};
 use bevy::render::render_asset::RenderAssets;
 use bevy::render::render_phase::{
-    BatchedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId, PhaseItem, DrawFunctions,
+    BatchedPhaseItem, CachedRenderPipelinePhaseItem, DrawFunctionId, DrawFunctions, PhaseItem,
 };
 use bevy::render::render_resource::{CachedRenderPipelineId, RenderPassColorAttachment};
 use bevy::render::{
@@ -233,8 +233,12 @@ impl Node for MainPassUINode {
 
                     let mut tracked_pass =
                         render_context.begin_tracked_render_pass(pass_descriptor);
-            
-                    for item in transparent_opacity_phase.items.iter().filter(|i| i.opacity_layer == layer_id) {
+
+                    for item in transparent_opacity_phase
+                        .items
+                        .iter()
+                        .filter(|i| i.opacity_layer == layer_id)
+                    {
                         let draw_function = draw_functions.get_mut(item.draw_function()).unwrap();
                         draw_function.draw(world, &mut tracked_pass, view_entity, item);
                     }

src/render/unified/pipeline.rs

@@ -950,12 +950,7 @@ pub fn queue_quads_inner(
                     position: final_position.into(),
                     color,
                     uv: [0.0; 4],
-                    pos_size: [
-                        0.0,
-                        0.0,
-                        sprite_rect.size().x,
-                        sprite_rect.size().y,
-                    ],
+                    pos_size: [0.0, 0.0, sprite_rect.size().x, sprite_rect.size().y],
                 });
             }
             *index += indices.len() as u32;

src/widget_context.rs

@@ -103,10 +103,7 @@ impl KayakWidgetContext {
             }
 
             // Finally check root AKA no parent.
-            if let Some(entity) = self
-                .context_entities
-                .get_context_entity::<T>(None)
-            {
+            if let Some(entity) = self.context_entities.get_context_entity::<T>(None) {
                 return Some(entity);
             }
         }
@@ -200,10 +197,10 @@ impl KayakWidgetContext {
     ///     widget_context.add_widget(None, root_entity);
     /// }
     ///```
-    pub fn spawn_widget<'a>(
+    pub fn spawn_widget(
         &self,
         commands: &mut Commands,
-        key: Option<&'a str>,
+        key: Option<&str>,
         parent_id: Option<Entity>,
     ) -> Entity {
         let mut entity = None;