make vector and scalar traits also imply Copy

Rust-GPU · Dec 20, 2024 · 14c03e5 · 14c03e5
1 parent 8788f92
commit 14c03e5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/crates/spirv-std/src/scalar.rs b/crates/spirv-std/src/scalar.rs
@@ -8,10 +8,7 @@ use core::num::NonZeroUsize;
 /// # Safety
 /// Implementing this trait on non-scalar types breaks assumptions of other unsafe code, and should
 /// not be done.
-pub unsafe trait Scalar:
-    VectorOrScalar<Scalar = Self> + Copy + Default + crate::sealed::Sealed
-{
-}
+pub unsafe trait Scalar: VectorOrScalar<Scalar = Self> + crate::sealed::Sealed {}
 
 macro_rules! impl_scalar {
     ($($ty:ty),+) => {

diff --git a/crates/spirv-std/src/vector.rs b/crates/spirv-std/src/vector.rs
@@ -9,7 +9,7 @@ use glam::{Vec3Swizzles, Vec4Swizzles};
 /// # Safety
 /// Implementing this trait on non-scalar or non-vector types may break assumptions about other
 /// unsafe code, and should not be done.
-pub unsafe trait VectorOrScalar: Default + Send + Sync + 'static {
+pub unsafe trait VectorOrScalar: Copy + Default + Send + Sync + 'static {
     /// Either the scalar component type of the vector or the scalar itself.
     type Scalar: Scalar;
 

diff --git a/tests/ui/arch/all.rs b/tests/ui/arch/all.rs
@@ -12,6 +12,7 @@ use spirv_std::{scalar::Scalar, vector::Vector, vector::VectorOrScalar};
 /// Fortunately, this requirement isn't checked on generic structs, so we have a way to work around
 /// it (for now at least)
 #[repr(simd)]
+#[derive(Copy, Clone, Debug)]
 struct Vec2<T>(T, T);
 unsafe impl<T: Scalar> VectorOrScalar for Vec2<T> {
     type Scalar = T;

diff --git a/tests/ui/arch/all.stderr b/tests/ui/arch/all.stderr
@@ -1,7 +1,7 @@
 warning: [Rust-GPU] temporarily re-allowing old-style `#[repr(simd)]` (with fields)
-  --> $DIR/all.rs:15:1
+  --> $DIR/all.rs:16:1
    |
-15 | struct Vec2<T>(T, T);
+16 | struct Vec2<T>(T, T);
    | ^^^^^^^^^^^^^^
    |
    = note: removed upstream by https://github.com/rust-lang/rust/pull/129403

diff --git a/tests/ui/arch/any.rs b/tests/ui/arch/any.rs
@@ -12,6 +12,7 @@ use spirv_std::{scalar::Scalar, vector::Vector, vector::VectorOrScalar};
 /// Fortunately, this requirement isn't checked on generic structs, so we have a way to work around
 /// it (for now at least)
 #[repr(simd)]
+#[derive(Copy, Clone, Debug)]
 struct Vec2<T>(T, T);
 unsafe impl<T: Scalar> VectorOrScalar for Vec2<T> {
     type Scalar = T;

diff --git a/tests/ui/arch/any.stderr b/tests/ui/arch/any.stderr
@@ -1,7 +1,7 @@
 warning: [Rust-GPU] temporarily re-allowing old-style `#[repr(simd)]` (with fields)
-  --> $DIR/any.rs:15:1
+  --> $DIR/any.rs:16:1
    |
-15 | struct Vec2<T>(T, T);
+16 | struct Vec2<T>(T, T);
    | ^^^^^^^^^^^^^^
    |
    = note: removed upstream by https://github.com/rust-lang/rust/pull/129403