From 27587912461cb3851a4b89707e8a7a1c01754be9 Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Wed, 12 Apr 2023 15:48:28 +0200 Subject: [PATCH] Clippy fixes --- crates/spirv-std/macros/src/image.rs | 2 +- crates/spirv-std/src/image.rs | 9 +++------ tests/ui/image/gather_err.stderr | 8 ++++---- tests/ui/image/query/query_levels_err.stderr | 4 ++-- tests/ui/image/query/query_lod_err.stderr | 4 ++-- tests/ui/image/query/query_size_err.stderr | 4 ++-- tests/ui/image/query/query_size_lod_err.stderr | 4 ++-- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/crates/spirv-std/macros/src/image.rs b/crates/spirv-std/macros/src/image.rs index 654779a10d..91560a7587 100644 --- a/crates/spirv-std/macros/src/image.rs +++ b/crates/spirv-std/macros/src/image.rs @@ -152,7 +152,7 @@ impl Parse for ImageType { let value = value.unwrap(); set_unique!( components = match value.base10_parse() { - Ok(n) if n >= 1 && n <= 4 => n, + Ok(n) if (1..=4).contains(&n) => n, _ => return Err(syn::Error::new( value.span(), diff --git a/crates/spirv-std/src/image.rs b/crates/spirv-std/src/image.rs index 19d048ccaa..35782edcf5 100644 --- a/crates/spirv-std/src/image.rs +++ b/crates/spirv-std/src/image.rs @@ -1,5 +1,7 @@ //! Image types +#[cfg(target_arch = "spirv")] +use crate::vector::VectorTruncateInto; #[cfg(target_arch = "spirv")] use core::arch::asm; @@ -14,12 +16,7 @@ pub use spirv_std_types::image_params::{ AccessQualifier, Arrayed, Dimensionality, ImageDepth, ImageFormat, Multisampled, Sampled, }; -use crate::{ - float::Float, - integer::Integer, - vector::{Vector, VectorTruncateInto}, - Sampler, -}; +use crate::{float::Float, integer::Integer, vector::Vector, Sampler}; /// Re-export of primitive types to ensure the `Image` proc macro always points /// to the right type. diff --git a/tests/ui/image/gather_err.stderr b/tests/ui/image/gather_err.stderr index b86b37eef5..5ef1b30f0f 100644 --- a/tests/ui/image/gather_err.stderr +++ b/tests/ui/image/gather_err.stderr @@ -9,9 +9,9 @@ error[E0277]: the trait bound `Image: HasGather` is no Image Image note: required by a bound in `Image::::gather` - --> $SPIRV_STD_SRC/image.rs:198:15 + --> $SPIRV_STD_SRC/image.rs:195:15 | -198 | Self: HasGather, +195 | Self: HasGather, | ^^^^^^^^^ required by this bound in `Image::::gather` error[E0277]: the trait bound `Image: HasGather` is not satisfied @@ -25,9 +25,9 @@ error[E0277]: the trait bound `Image: HasGather` is no Image Image note: required by a bound in `Image::::gather` - --> $SPIRV_STD_SRC/image.rs:198:15 + --> $SPIRV_STD_SRC/image.rs:195:15 | -198 | Self: HasGather, +195 | Self: HasGather, | ^^^^^^^^^ required by this bound in `Image::::gather` error: aborting due to 2 previous errors diff --git a/tests/ui/image/query/query_levels_err.stderr b/tests/ui/image/query/query_levels_err.stderr index 629594f07b..f2d2a1e0c0 100644 --- a/tests/ui/image/query/query_levels_err.stderr +++ b/tests/ui/image/query/query_levels_err.stderr @@ -10,9 +10,9 @@ error[E0277]: the trait bound `Image: HasQueryLevels` Image Image note: required by a bound in `Image::::query_levels` - --> $SPIRV_STD_SRC/image.rs:882:15 + --> $SPIRV_STD_SRC/image.rs:879:15 | -882 | Self: HasQueryLevels, +879 | Self: HasQueryLevels, | ^^^^^^^^^^^^^^ required by this bound in `Image::::query_levels` error: aborting due to previous error diff --git a/tests/ui/image/query/query_lod_err.stderr b/tests/ui/image/query/query_lod_err.stderr index 32ca0fa1ad..e818578068 100644 --- a/tests/ui/image/query/query_lod_err.stderr +++ b/tests/ui/image/query/query_lod_err.stderr @@ -10,9 +10,9 @@ error[E0277]: the trait bound `Image: HasQueryLevels` Image Image note: required by a bound in `Image::::query_lod` - --> $SPIRV_STD_SRC/image.rs:908:15 + --> $SPIRV_STD_SRC/image.rs:905:15 | -908 | Self: HasQueryLevels, +905 | Self: HasQueryLevels, | ^^^^^^^^^^^^^^ required by this bound in `Image::::query_lod` error: aborting due to previous error diff --git a/tests/ui/image/query/query_size_err.stderr b/tests/ui/image/query/query_size_err.stderr index 7d730341cd..8d743b7ac0 100644 --- a/tests/ui/image/query/query_size_err.stderr +++ b/tests/ui/image/query/query_size_err.stderr @@ -15,9 +15,9 @@ error[E0277]: the trait bound `Image: HasQuerySize` is Image and 6 others note: required by a bound in `Image::::query_size` - --> $SPIRV_STD_SRC/image.rs:939:15 + --> $SPIRV_STD_SRC/image.rs:936:15 | -939 | Self: HasQuerySize, +936 | Self: HasQuerySize, | ^^^^^^^^^^^^ required by this bound in `Image::::query_size` error: aborting due to previous error diff --git a/tests/ui/image/query/query_size_lod_err.stderr b/tests/ui/image/query/query_size_lod_err.stderr index a2db4397ed..978044aa17 100644 --- a/tests/ui/image/query/query_size_lod_err.stderr +++ b/tests/ui/image/query/query_size_lod_err.stderr @@ -10,9 +10,9 @@ error[E0277]: the trait bound `Image: HasQuerySizeLod` Image Image note: required by a bound in `Image::::query_size_lod` - --> $SPIRV_STD_SRC/image.rs:983:15 + --> $SPIRV_STD_SRC/image.rs:980:15 | -983 | Self: HasQuerySizeLod, +980 | Self: HasQuerySizeLod, | ^^^^^^^^^^^^^^^ required by this bound in `Image::::query_size_lod` error: aborting due to previous error