Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
robtfm committed Aug 20, 2024
1 parent 766082b commit 6ac365b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
4 changes: 1 addition & 3 deletions crates/bevy_pbr/src/material.rs
Original file line number Diff line number Diff line change
Expand Up @@ -953,9 +953,7 @@ impl<M: Material> RenderAsset for PreparedMaterial<M> {
Err(AsBindGroupError::RetryNextUpdate) => {
Err(PrepareAssetError::RetryNextUpdate(material))
}
Err(other) => {
Err(PrepareAssetError::AsBindGroupError(other))
}
Err(other) => Err(PrepareAssetError::AsBindGroupError(other)),
}
}
}
Expand Down
19 changes: 15 additions & 4 deletions crates/bevy_render/src/render_asset.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use crate::{render_resource::AsBindGroupError, ExtractSchedule, MainWorld, Render, RenderApp, RenderSet};
use crate::{
render_resource::AsBindGroupError, ExtractSchedule, MainWorld, Render, RenderApp, RenderSet,
};
use bevy_app::{App, Plugin, SubApp};
use bevy_asset::{Asset, AssetEvent, AssetId, Assets};
use bevy_ecs::{
Expand All @@ -9,7 +11,10 @@ use bevy_ecs::{
};
use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
use bevy_render_macros::ExtractResource;
use bevy_utils::{tracing::{debug, error}, HashMap, HashSet};
use bevy_utils::{
tracing::{debug, error},
HashMap, HashSet,
};
use serde::{Deserialize, Serialize};
use std::marker::PhantomData;
use thiserror::Error;
Expand Down Expand Up @@ -362,7 +367,10 @@ pub fn prepare_assets<A: RenderAsset>(
prepare_next_frame.assets.push((id, extracted_asset));
}
Err(PrepareAssetError::AsBindGroupError(e)) => {
error!("{} Bind group construction failed: {e}", std::any::type_name::<A>()) ;
error!(
"{} Bind group construction failed: {e}",
std::any::type_name::<A>()
);
}
}
}
Expand Down Expand Up @@ -397,7 +405,10 @@ pub fn prepare_assets<A: RenderAsset>(
prepare_next_frame.assets.push((id, extracted_asset));
}
Err(PrepareAssetError::AsBindGroupError(e)) => {
error!("{} Bind group construction failed: {e}", std::any::type_name::<A>()) ;
error!(
"{} Bind group construction failed: {e}",
std::any::type_name::<A>()
);
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions crates/bevy_sprite/src/mesh2d/material.rs
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,7 @@ impl<M: Material2d> RenderAsset for PreparedMaterial2d<M> {
Err(AsBindGroupError::RetryNextUpdate) => {
Err(PrepareAssetError::RetryNextUpdate(material))
}
Err(other) => {
Err(PrepareAssetError::AsBindGroupError(other))
}
Err(other) => Err(PrepareAssetError::AsBindGroupError(other)),
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions crates/bevy_ui/src/render/ui_material_pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,7 @@ impl<M: UiMaterial> RenderAsset for PreparedUiMaterial<M> {
Err(AsBindGroupError::RetryNextUpdate) => {
Err(PrepareAssetError::RetryNextUpdate(material))
}
Err(other) => {
Err(PrepareAssetError::AsBindGroupError(other))
}
Err(other) => Err(PrepareAssetError::AsBindGroupError(other)),
}
}
}
Expand Down

0 comments on commit 6ac365b

Please sign in to comment.