clippy: expect large variants and other small fixes (#19222)
# Objective - Fix CI ## Solution - Expect new lint - See #19220 ## Testing - cargo clippy
This commit is contained in:
parent
01d2b8571c
commit
415ffa5028
@ -1847,8 +1847,7 @@ mod tests {
|
|||||||
|
|
||||||
let mut new = value.map_unchanged(|ptr| {
|
let mut new = value.map_unchanged(|ptr| {
|
||||||
// SAFETY: The underlying type of `ptr` matches `reflect_from_ptr`.
|
// SAFETY: The underlying type of `ptr` matches `reflect_from_ptr`.
|
||||||
let value = unsafe { reflect_from_ptr.as_reflect_mut(ptr) };
|
unsafe { reflect_from_ptr.as_reflect_mut(ptr) }
|
||||||
value
|
|
||||||
});
|
});
|
||||||
|
|
||||||
assert!(!new.is_changed());
|
assert!(!new.is_changed());
|
||||||
|
@ -392,6 +392,10 @@ where
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The buffer of GPU preprocessing work items for a single view.
|
/// The buffer of GPU preprocessing work items for a single view.
|
||||||
|
#[expect(
|
||||||
|
clippy::large_enum_variant,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
pub enum PreprocessWorkItemBuffers {
|
pub enum PreprocessWorkItemBuffers {
|
||||||
/// The work items we use if we aren't using indirect drawing.
|
/// The work items we use if we aren't using indirect drawing.
|
||||||
///
|
///
|
||||||
|
@ -158,6 +158,10 @@ pub struct MeshBufferSlice<'a> {
|
|||||||
pub struct SlabId(pub NonMaxU32);
|
pub struct SlabId(pub NonMaxU32);
|
||||||
|
|
||||||
/// Data for a single slab.
|
/// Data for a single slab.
|
||||||
|
#[expect(
|
||||||
|
clippy::large_enum_variant,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
enum Slab {
|
enum Slab {
|
||||||
/// A slab that can contain multiple objects.
|
/// A slab that can contain multiple objects.
|
||||||
General(GeneralSlab),
|
General(GeneralSlab),
|
||||||
|
@ -80,6 +80,10 @@ pub struct CachedPipeline {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// State of a cached pipeline inserted into a [`PipelineCache`].
|
/// State of a cached pipeline inserted into a [`PipelineCache`].
|
||||||
|
#[expect(
|
||||||
|
clippy::large_enum_variant,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum CachedPipelineState {
|
pub enum CachedPipelineState {
|
||||||
/// The pipeline GPU object is queued for creation.
|
/// The pipeline GPU object is queued for creation.
|
||||||
@ -189,6 +193,10 @@ impl ShaderCache {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[expect(
|
||||||
|
clippy::result_large_err,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
fn add_import_to_composer(
|
fn add_import_to_composer(
|
||||||
composer: &mut naga_oil::compose::Composer,
|
composer: &mut naga_oil::compose::Composer,
|
||||||
import_path_shaders: &HashMap<ShaderImport, AssetId<Shader>>,
|
import_path_shaders: &HashMap<ShaderImport, AssetId<Shader>>,
|
||||||
@ -216,6 +224,10 @@ impl ShaderCache {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[expect(
|
||||||
|
clippy::result_large_err,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
fn get(
|
fn get(
|
||||||
&mut self,
|
&mut self,
|
||||||
render_device: &RenderDevice,
|
render_device: &RenderDevice,
|
||||||
@ -1090,6 +1102,10 @@ fn create_pipeline_task(
|
|||||||
target_os = "macos",
|
target_os = "macos",
|
||||||
not(feature = "multi_threaded")
|
not(feature = "multi_threaded")
|
||||||
))]
|
))]
|
||||||
|
#[expect(
|
||||||
|
clippy::large_enum_variant,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
fn create_pipeline_task(
|
fn create_pipeline_task(
|
||||||
task: impl Future<Output = Result<Pipeline, PipelineCacheError>> + Send + 'static,
|
task: impl Future<Output = Result<Pipeline, PipelineCacheError>> + Send + 'static,
|
||||||
_sync: bool,
|
_sync: bool,
|
||||||
@ -1101,6 +1117,10 @@ fn create_pipeline_task(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Type of error returned by a [`PipelineCache`] when the creation of a GPU pipeline object failed.
|
/// Type of error returned by a [`PipelineCache`] when the creation of a GPU pipeline object failed.
|
||||||
|
#[expect(
|
||||||
|
clippy::large_enum_variant,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum PipelineCacheError {
|
pub enum PipelineCacheError {
|
||||||
#[error(
|
#[error(
|
||||||
|
@ -152,6 +152,10 @@ pub struct RenderResources(
|
|||||||
);
|
);
|
||||||
|
|
||||||
/// An enum describing how the renderer will initialize resources. This is used when creating the [`RenderPlugin`](crate::RenderPlugin).
|
/// An enum describing how the renderer will initialize resources. This is used when creating the [`RenderPlugin`](crate::RenderPlugin).
|
||||||
|
#[expect(
|
||||||
|
clippy::large_enum_variant,
|
||||||
|
reason = "See https://github.com/bevyengine/bevy/issues/19220"
|
||||||
|
)]
|
||||||
pub enum RenderCreation {
|
pub enum RenderCreation {
|
||||||
/// Allows renderer resource initialization to happen outside of the rendering plugin.
|
/// Allows renderer resource initialization to happen outside of the rendering plugin.
|
||||||
Manual(RenderResources),
|
Manual(RenderResources),
|
||||||
|
@ -532,7 +532,7 @@ fn get_attrs<'a>(
|
|||||||
face_info: &'a FontFaceInfo,
|
face_info: &'a FontFaceInfo,
|
||||||
scale_factor: f64,
|
scale_factor: f64,
|
||||||
) -> Attrs<'a> {
|
) -> Attrs<'a> {
|
||||||
let attrs = Attrs::new()
|
Attrs::new()
|
||||||
.metadata(span_index)
|
.metadata(span_index)
|
||||||
.family(Family::Name(&face_info.family_name))
|
.family(Family::Name(&face_info.family_name))
|
||||||
.stretch(face_info.stretch)
|
.stretch(face_info.stretch)
|
||||||
@ -545,8 +545,7 @@ fn get_attrs<'a>(
|
|||||||
}
|
}
|
||||||
.scale(scale_factor as f32),
|
.scale(scale_factor as f32),
|
||||||
)
|
)
|
||||||
.color(cosmic_text::Color(color.to_linear().as_u32()));
|
.color(cosmic_text::Color(color.to_linear().as_u32()))
|
||||||
attrs
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Calculate the size of the text area for the given buffer.
|
/// Calculate the size of the text area for the given buffer.
|
||||||
|
Loading…
Reference in New Issue
Block a user