Fmt.

bevy_nannou_derive/tests/shader_model_tests.rs

@@ -7,7 +7,10 @@ struct TestShaderModel {}
 
 #[test]
 fn test_default_shaders() {
-    assert!(matches!(TestShaderModel::vertex_shader(), ShaderRef::Default));
+    assert!(matches!(
+        TestShaderModel::vertex_shader(),
+        ShaderRef::Default
+    ));
     assert!(matches!(
         TestShaderModel::fragment_shader(),
         ShaderRef::Default

bevy_nannou_draw/src/draw/background.rs

@@ -1,4 +1,4 @@
-use bevy::prelude::{Color};
+use bevy::prelude::Color;
 
 use crate::draw::{Draw, DrawCommand};
 use crate::render::ShaderModel;

bevy_nannou_draw/src/draw/drawing.rs

@@ -167,7 +167,9 @@ where
 
         let shader_model = map(shader_model.clone());
         let mut state = state.write().unwrap();
-        state.shader_models.insert(new_id.clone(), Box::new(shader_model));
+        state
+            .shader_models
+            .insert(new_id.clone(), Box::new(shader_model));
         // Mark the last shader model as the new model so that further drawings use the same model
         // as the parent draw ref.
         state.last_shader_model = Some(new_id.clone());

bevy_nannou_draw/src/draw/indirect.rs

@@ -115,8 +115,7 @@ where
     SM::Data: PartialEq + Eq + Hash + Clone,
 {
     fn build(&self, app: &mut App) {
-        app
-            .sub_app_mut(RenderApp)
+        app.sub_app_mut(RenderApp)
             .add_render_command::<Transparent3d, DrawIndirectShaderModel<SM>>()
             .add_systems(
                 Render,

bevy_nannou_draw/src/draw/instanced.rs

@@ -7,9 +7,7 @@ use crate::{
 use bevy::{
     core_pipeline::core_3d::Transparent3d,
     ecs::system::{lifetimeless::*, SystemParamItem},
-    pbr::{
-        RenderMeshInstances, SetMeshBindGroup, SetMeshViewBindGroup,
-    },
+    pbr::{RenderMeshInstances, SetMeshBindGroup, SetMeshViewBindGroup},
     prelude::*,
     render::{
         extract_component::{ExtractComponent, ExtractComponentPlugin},

bevy_nannou_draw/src/render.rs

@@ -1,13 +1,14 @@
 use crate::{
     draw::{
-        indirect::{IndirectShaderModelPlugin, IndirectMesh},
-        instanced::{InstanceRange, InstancedShaderModelPlugin, InstancedMesh},
+        indirect::{IndirectMesh, IndirectShaderModelPlugin},
+        instanced::{InstanceRange, InstancedMesh, InstancedShaderModelPlugin},
         mesh::MeshExt,
         render::{RenderContext, RenderPrimitive},
         DrawCommand, DrawContext,
     },
     DrawHolder,
 };
+use bevy::render::storage::ShaderStorageBuffer;
 use bevy::{
     asset::{load_internal_asset, Asset, UntypedAssetId},
     core_pipeline::core_3d::Transparent3d,
@@ -16,8 +17,7 @@ use bevy::{
         system::{lifetimeless::SRes, SystemParamItem},
     },
     pbr::{
-        DefaultOpaqueRendererMethod, DrawMesh,
-        MeshPipeline, MeshPipelineKey, OpaqueRendererMethod,
+        DefaultOpaqueRendererMethod, DrawMesh, MeshPipeline, MeshPipelineKey, OpaqueRendererMethod,
         RenderMeshInstances, SetMeshBindGroup, SetMeshViewBindGroup,
     },
     prelude::{TypePath, *},
@@ -53,7 +53,6 @@ use bevy::{
 };
 use lyon::lyon_tessellation::{FillTessellator, StrokeTessellator};
 use std::{any::TypeId, hash::Hash, marker::PhantomData};
-use bevy::render::storage::ShaderStorageBuffer;
 
 pub const DEFAULT_NANNOU_SHADER_HANDLE: Handle<Shader> = Handle::weak_from_u128(3086880141013591);
 
@@ -136,7 +135,10 @@ where
                 IndirectShaderModelPlugin::<SM>::default(),
                 InstancedShaderModelPlugin::<SM>::default(),
             ))
-            .add_systems(PostUpdate, update_shader_model::<SM>.after(update_draw_mesh));
+            .add_systems(
+                PostUpdate,
+                update_shader_model::<SM>.after(update_draw_mesh),
+            );
 
         app.sub_app_mut(RenderApp)
             .add_render_command::<Transparent3d, DrawShaderModel<SM>>()
@@ -176,7 +178,11 @@ impl<SM: ShaderModel> RenderAsset for PreparedShaderModel<SM> {
         shader_model: Self::SourceAsset,
         (render_device, pipeline, ref mut shader_model_param): &mut SystemParamItem<Self::Param>,
     ) -> Result<Self, PrepareAssetError<Self::SourceAsset>> {
-        match shader_model.as_bind_group(&pipeline.shader_model_layout, render_device, shader_model_param) {
+        match shader_model.as_bind_group(
+            &pipeline.shader_model_layout,
+            render_device,
+            shader_model_param,
+        ) {
             Ok(prepared) => Ok(PreparedShaderModel {
                 bindings: prepared.bindings,
                 bind_group: prepared.bind_group,
@@ -638,7 +644,8 @@ fn update_draw_mesh(
                     let mut mesh = Mesh::init();
                     prim.render_primitive(ctxt, &mut mesh);
                     let mesh = meshes.add(mesh);
-                    let model_id = last_shader_model.expect("No shader model set for instanced draw command");
+                    let model_id =
+                        last_shader_model.expect("No shader model set for instanced draw command");
                     commands.spawn((
                         InstancedMesh,
                         InstanceRange(range),
@@ -674,7 +681,8 @@ fn update_draw_mesh(
                     let mut mesh = Mesh::init();
                     prim.render_primitive(ctxt, &mut mesh);
                     let mesh = meshes.add(mesh);
-                    let model_id = last_shader_model.expect("No shader model set for instanced draw command");
+                    let model_id =
+                        last_shader_model.expect("No shader model set for instanced draw command");
                     commands.spawn((
                         IndirectMesh,
                         indirect_buffer,

bevy_nannou_isf/src/render.rs

@@ -1,6 +1,6 @@
 use bevy::asset::embedded_asset;
 use bevy::core_pipeline::core_3d::graph::{Core3d, Node3d};
-use bevy::core_pipeline::core_3d::{CORE_3D_DEPTH_FORMAT};
+use bevy::core_pipeline::core_3d::CORE_3D_DEPTH_FORMAT;
 use bevy::core_pipeline::fullscreen_vertex_shader::{
     fullscreen_shader_vertex_state, FULLSCREEN_SHADER_HANDLE,
 };

examples/draw/draw_texture.rs

@@ -25,6 +25,5 @@ fn view(app: &App, model: &Model) {
     let draw = app.draw();
     draw.background().color(BLACK);
     let win = app.window_rect();
-    draw.rect().x_y(win.x(), win.y())
-        .texture(&model.texture);
+    draw.rect().x_y(win.x(), win.y()).texture(&model.texture);
 }

nannou/src/app.rs

@@ -40,7 +40,7 @@ use bevy_inspector_egui::DefaultInspectorConfigPlugin;
 use crate::frame::{Frame, FramePlugin};
 use crate::prelude::bevy_ecs::system::SystemState;
 use crate::prelude::bevy_reflect::DynamicTyped;
-use crate::prelude::render::{NannouShaderModelPlugin, NannouMesh, ShaderModel};
+use crate::prelude::render::{NannouMesh, NannouShaderModelPlugin, ShaderModel};
 use crate::render::{
     compute::{Compute, ComputeModel, ComputePlugin, ComputeShaderHandle, ComputeState},
     NannouRenderNode, RenderApp, RenderPlugin,
@@ -356,9 +356,8 @@ where
         SM: ShaderModel,
         SM::Data: PartialEq + Eq + Hash + Clone,
     {
-        self.app.add_plugins((
-            NannouShaderModelPlugin::<SM>::default(),
-        ));
+        self.app
+            .add_plugins((NannouShaderModelPlugin::<SM>::default(),));
         self
     }