ScalarComposite: rename ScalarOrVectorComposite to ScalarComposite, bulk rename

Author: Firestar99

crates/spirv-std/macros/src/lib.rs

@@ -313,7 +313,7 @@ pub fn gen_sample_param_permutations(_attr: TokenStream, item: TokenStream) -> T
     sample_param_permutations::gen_sample_param_permutations(item)
 }
 
-#[proc_macro_derive(ScalarOrVectorComposite)]
+#[proc_macro_derive(ScalarComposite)]
 pub fn derive_scalar_or_vector_composite(item: TokenStream) -> TokenStream {
     scalar_or_vector_composite::derive(item.into())
         .unwrap_or_else(syn::Error::into_compile_error)

crates/spirv-std/macros/src/scalar_or_vector_composite.rs

@@ -35,7 +35,7 @@ pub fn derive(item: TokenStream) -> syn::Result<TokenStream> {
     let where_clause = &item.generics.where_clause;
 
     Ok(quote! {
-        impl<#gens> #spirv_std::ScalarOrVectorComposite for #ident<#gen_refs> #where_clause {
+        impl<#gens> #spirv_std::ScalarComposite for #ident<#gen_refs> #where_clause {
             #[inline]
             fn transform<F: #spirv_std::ScalarOrVectorTransform>(self, f: &mut F) -> Self {
                 #content
@@ -51,7 +51,7 @@ pub fn derive_struct(spirv_std: &TokenStream, data: &DataStruct) -> syn::Result<
                 .iter()
                 .map(|f| {
                     let ident = &f.ident;
-                    quote!(#ident: #spirv_std::ScalarOrVectorComposite::transform(self.#ident, f))
+                    quote!(#ident: #spirv_std::ScalarComposite::transform(self.#ident, f))
                 })
                 .collect::<Punctuated<_, Token![,]>>();
             quote!(Self { #content })
@@ -60,7 +60,7 @@ pub fn derive_struct(spirv_std: &TokenStream, data: &DataStruct) -> syn::Result<
             let content = (0..unnamed.len())
                 .map(|i| {
                     let i = syn::Index::from(i);
-                    quote!(#spirv_std::ScalarOrVectorComposite::transform(self.#i, f))
+                    quote!(#spirv_std::ScalarComposite::transform(self.#i, f))
                 })
                 .collect::<Punctuated<_, Token![,]>>();
             quote!(Self(#content))
@@ -85,6 +85,6 @@ pub fn derive_enum(spirv_std: &TokenStream, item: &DeriveInput) -> syn::Result<T
     let prim = &repr.meta.require_list()?.tokens;
     Ok(quote! {
         #spirv_std::assert_is_integer::<#prim>();
-        <Self as From<#prim>>::from(#spirv_std::ScalarOrVectorComposite::transform(<Self as Into<#prim>>::into(self), f))
+        <Self as From<#prim>>::from(#spirv_std::ScalarComposite::transform(<Self as Into<#prim>>::into(self), f))
     })
 }

crates/spirv-std/src/arch/subgroup.rs

@@ -4,9 +4,7 @@ use crate::ScalarOrVectorTransform;
 use crate::arch::{asm, barrier};
 #[cfg(target_arch = "spirv")]
 use crate::memory::{Scope, Semantics};
-use crate::{
-    Float, Integer, ScalarOrVector, ScalarOrVectorComposite, SignedInteger, UnsignedInteger,
-};
+use crate::{Float, Integer, ScalarComposite, ScalarOrVector, SignedInteger, UnsignedInteger};
 
 #[cfg(target_arch = "spirv")]
 const SUBGROUP: u32 = Scope::Subgroup as u32;
@@ -244,7 +242,7 @@ pub fn subgroup_any(predicate: bool) -> bool {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformAllEqual")]
 #[inline]
-pub fn subgroup_all_equal<T: ScalarOrVectorComposite>(value: T) -> bool {
+pub fn subgroup_all_equal<T: ScalarComposite>(value: T) -> bool {
     struct Transform(bool);
 
     impl ScalarOrVectorTransform for Transform {
@@ -299,7 +297,7 @@ pub fn subgroup_all_equal<T: ScalarOrVectorComposite>(value: T) -> bool {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformBroadcast")]
 #[inline]
-pub unsafe fn subgroup_broadcast<T: ScalarOrVectorComposite>(value: T, id: u32) -> T {
+pub unsafe fn subgroup_broadcast<T: ScalarComposite>(value: T, id: u32) -> T {
     struct Transform {
         id: u32,
     }
@@ -390,7 +388,7 @@ pub unsafe fn subgroup_broadcast_const<T: ScalarOrVector, const ID: u32>(value:
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformBroadcastFirst")]
 #[inline]
-pub fn subgroup_broadcast_first<T: ScalarOrVectorComposite>(value: T) -> T {
+pub fn subgroup_broadcast_first<T: ScalarComposite>(value: T) -> T {
     struct Transform;
 
     impl ScalarOrVectorTransform for Transform {
@@ -672,7 +670,7 @@ pub fn subgroup_ballot_find_msb(value: SubgroupMask) -> u32 {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformShuffle")]
 #[inline]
-pub fn subgroup_shuffle<T: ScalarOrVectorComposite>(value: T, id: u32) -> T {
+pub fn subgroup_shuffle<T: ScalarComposite>(value: T, id: u32) -> T {
     struct Transform {
         id: u32,
     }
@@ -722,7 +720,7 @@ pub fn subgroup_shuffle<T: ScalarOrVectorComposite>(value: T, id: u32) -> T {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformShuffleXor")]
 #[inline]
-pub fn subgroup_shuffle_xor<T: ScalarOrVectorComposite>(value: T, mask: u32) -> T {
+pub fn subgroup_shuffle_xor<T: ScalarComposite>(value: T, mask: u32) -> T {
     struct Transform {
         mask: u32,
     }
@@ -772,7 +770,7 @@ pub fn subgroup_shuffle_xor<T: ScalarOrVectorComposite>(value: T, mask: u32) ->
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformShuffleUp")]
 #[inline]
-pub fn subgroup_shuffle_up<T: ScalarOrVectorComposite>(value: T, delta: u32) -> T {
+pub fn subgroup_shuffle_up<T: ScalarComposite>(value: T, delta: u32) -> T {
     struct Transform {
         delta: u32,
     }
@@ -822,7 +820,7 @@ pub fn subgroup_shuffle_up<T: ScalarOrVectorComposite>(value: T, delta: u32) ->
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformShuffleDown")]
 #[inline]
-pub fn subgroup_shuffle_down<T: ScalarOrVectorComposite>(value: T, delta: u32) -> T {
+pub fn subgroup_shuffle_down<T: ScalarComposite>(value: T, delta: u32) -> T {
     struct Transform {
         delta: u32,
     }
@@ -1458,7 +1456,7 @@ Requires Capability `GroupNonUniformArithmetic` and `GroupNonUniformClustered`.
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformQuadBroadcast")]
 #[inline]
-pub fn subgroup_quad_broadcast<T: ScalarOrVectorComposite>(value: T, index: u32) -> T {
+pub fn subgroup_quad_broadcast<T: ScalarComposite>(value: T, index: u32) -> T {
     struct Transform {
         index: u32,
     }
@@ -1550,7 +1548,7 @@ pub enum QuadDirection {
 #[spirv_std_macros::gpu_only]
 #[doc(alias = "OpGroupNonUniformQuadSwap")]
 #[inline]
-pub fn subgroup_quad_swap<const DIRECTION: u32, T: ScalarOrVectorComposite>(value: T) -> T {
+pub fn subgroup_quad_swap<const DIRECTION: u32, T: ScalarComposite>(value: T) -> T {
     struct Transform<const DIRECTION: u32>;
 
     impl<const DIRECTION: u32> ScalarOrVectorTransform for Transform<DIRECTION> {

crates/spirv-std/src/lib.rs

@@ -87,7 +87,7 @@
 /// Public re-export of the `spirv-std-macros` crate.
 #[macro_use]
 pub extern crate spirv_std_macros as macros;
-pub use macros::ScalarOrVectorComposite;
+pub use macros::ScalarComposite;
 pub use macros::spirv;
 pub use macros::{debug_printf, debug_printfln};
 

crates/spirv-std/src/scalar.rs

@@ -1,7 +1,7 @@
 //! Traits related to scalars.
 
 use crate::sealed::Sealed;
-use crate::{ScalarOrVector, ScalarOrVectorComposite, ScalarOrVectorTransform};
+use crate::{ScalarComposite, ScalarOrVector, ScalarOrVectorTransform};
 use core::num::NonZeroUsize;
 
 /// Abstract trait representing a SPIR-V scalar type, which includes:
@@ -61,7 +61,7 @@ pub unsafe trait Float: num_traits::Float + Number {
 macro_rules! impl_scalar {
     (impl Scalar for $ty:ty;) => {
         impl Sealed for $ty {}
-        impl ScalarOrVectorComposite for $ty {
+        impl ScalarComposite for $ty {
             #[inline]
 			fn transform<F: ScalarOrVectorTransform>(self, f: &mut F) -> Self {
 				f.transform_scalar(self)

crates/spirv-std/src/scalar_or_vector.rs

@@ -11,7 +11,7 @@ pub(crate) mod sealed {
 ///
 /// # Safety
 /// Your type must also implement [`Scalar`] or [`Vector`], see their safety sections as well.
-pub unsafe trait ScalarOrVector: ScalarOrVectorComposite + Default {
+pub unsafe trait ScalarOrVector: ScalarComposite + Default {
     /// Either the scalar component type of the vector or the scalar itself.
     type Scalar: Scalar;
 
@@ -48,14 +48,14 @@ pub unsafe trait ScalarOrVector: ScalarOrVectorComposite + Default {
 /// [`FromPrimitive`]: https://docs.rs/num_enum/latest/num_enum/derive.FromPrimitive.html
 /// [`IntoPrimitive`]: https://docs.rs/num_enum/latest/num_enum/derive.IntoPrimitive.html
 /// [`num_enum`]: https://crates.io/crates/num_enum
-pub trait ScalarOrVectorComposite: Copy + Send + Sync + 'static {
+pub trait ScalarComposite: Copy + Send + Sync + 'static {
     /// Transform the individual [`Scalar`] and [`Vector`] values of this type to a different value.
     ///
     /// See [`Self`] for more detail.
     fn transform<F: ScalarOrVectorTransform>(self, f: &mut F) -> Self;
 }
 
-/// A transform operation for [`ScalarOrVectorComposite::transform`]
+/// A transform operation for [`ScalarComposite::transform`]
 pub trait ScalarOrVectorTransform {
     /// transform a [`ScalarOrVector`]
     fn transform<T: ScalarOrVector>(&mut self, value: T) -> T;
@@ -74,7 +74,7 @@ pub trait ScalarOrVectorTransform {
 }
 
 /// `Default` is unfortunately necessary until rust-gpu improves
-impl<T: ScalarOrVectorComposite + Default, const N: usize> ScalarOrVectorComposite for [T; N] {
+impl<T: ScalarComposite + Default, const N: usize> ScalarComposite for [T; N] {
     #[inline]
     fn transform<F: ScalarOrVectorTransform>(self, f: &mut F) -> Self {
         let mut out = [T::default(); N];

crates/spirv-std/src/vector.rs

@@ -1,7 +1,7 @@
 //! Traits related to vectors.
 
 use crate::sealed::Sealed;
-use crate::{Scalar, ScalarOrVector, ScalarOrVectorComposite, ScalarOrVectorTransform};
+use crate::{Scalar, ScalarComposite, ScalarOrVector, ScalarOrVectorTransform};
 use core::num::NonZeroUsize;
 use glam::{Vec3Swizzles, Vec4Swizzles};
 
@@ -57,7 +57,7 @@ macro_rules! impl_vector {
     ($($ty:ty: [$scalar:ty; $n:literal];)+) => {
         $(
             impl Sealed for $ty {}
-            impl ScalarOrVectorComposite for $ty {
+            impl ScalarComposite for $ty {
                 #[inline]
                 fn transform<F: ScalarOrVectorTransform>(self, f: &mut F) -> Self {
                     f.transform_vector(self)

tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_0_fail.stderr

@@ -1,5 +1,5 @@
 error[E0080]: evaluation panicked: `ClusterSize` must be at least 1
-  --> $SPIRV_STD_SRC/arch/subgroup.rs:939:1
+  --> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
    |
 LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
 LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.
@@ -13,7 +13,7 @@ LL | | ");
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $SPIRV_STD_SRC/arch/subgroup.rs:939:1
+  --> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
    |
 LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
 LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.

tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_non_power_of_two_fail.stderr

@@ -1,5 +1,5 @@
 error[E0080]: evaluation panicked: `ClusterSize` must be a power of 2
-  --> $SPIRV_STD_SRC/arch/subgroup.rs:939:1
+  --> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
    |
 LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
 LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.
@@ -13,7 +13,7 @@ LL | | ");
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: erroneous constant encountered
-  --> $SPIRV_STD_SRC/arch/subgroup.rs:939:1
+  --> $SPIRV_STD_SRC/arch/subgroup.rs:937:1
    |
 LL | / macro_subgroup_op_clustered!(impl Integer, "OpGroupNonUniformIAdd", subgroup_clustered_i_add; r"
 LL | | An integer add group operation of all `value` operands contributed by active invocations in the group.

tests/compiletests/ui/arch/subgroup/subgroup_composite.rs

@@ -10,22 +10,22 @@
 // ignore-spv1.4
 
 use glam::*;
-use spirv_std::ScalarOrVectorComposite;
+use spirv_std::ScalarComposite;
 use spirv_std::arch::*;
 use spirv_std::spirv;
 
-#[derive(Copy, Clone, ScalarOrVectorComposite)]
+#[derive(Copy, Clone, ScalarComposite)]
 pub struct MyStruct {
     a: f32,
     b: UVec3,
     c: Nested,
     d: Zst,
 }
 
-#[derive(Copy, Clone, ScalarOrVectorComposite)]
+#[derive(Copy, Clone, ScalarComposite)]
 pub struct Nested(i32);
 
-#[derive(Copy, Clone, ScalarOrVectorComposite)]
+#[derive(Copy, Clone, ScalarComposite)]
 pub struct Zst;
 
 #[spirv(compute(threads(32)))]