diff --git a/codegen/templates/affine.rs.tera b/codegen/templates/affine.rs.tera index f9b5141c..5a99cea0 100644 --- a/codegen/templates/affine.rs.tera +++ b/codegen/templates/affine.rs.tera @@ -28,8 +28,12 @@ {% if dim == 2 %} {% set size = 6 %} + {% set mat_size = 4 %} + {% set vec_size = 2 %} {% elif dim == 3 %} {% set size = 12 %} + {% set mat_size = 9 %} + {% set vec_size = 3 %} {% endif %} {% set components = ["x", "y", "z", "w"] | slice(end = dim + 1) %} @@ -108,8 +112,16 @@ impl {{ self_t }} { #[must_use] pub fn from_cols_array(m: &[{{ scalar_t }}; {{ size }}]) -> Self { Self { - matrix{{ dim }}: {{ mat_t }}::from_cols_slice(&m[0..{{ dim * dim }}]), - translation: {{ col_t }}::from_slice(&m[{{ dim * dim }}..{{ size }}]), + matrix{{ dim }}: {{ mat_t }}::from_cols_array(&[ + {% for i in range(end = mat_size) %} + m[{{ i }}], + {%- endfor %} + ]), + translation: {{ col_t }}::from_array([ + {% for i in range(start = mat_size, end = mat_size + vec_size) %} + m[{{ i }}], + {%- endfor %} + ]), } } @@ -721,7 +733,6 @@ impl PartialEq for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Debug for {{ self_t }} { fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fmt.debug_struct(stringify!({{ self_t }})) @@ -731,7 +742,6 @@ impl core::fmt::Debug for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Display for {{ self_t }} { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { if let Some(p) = f.precision() { diff --git a/codegen/templates/mat.rs.tera b/codegen/templates/mat.rs.tera index fdb0f6e1..345353b5 100644 --- a/codegen/templates/mat.rs.tera +++ b/codegen/templates/mat.rs.tera @@ -101,7 +101,6 @@ use crate::{ {{ scalar_t }}::math, swizzles::*, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -2594,7 +2593,6 @@ impl core::ops::DerefMut for Mat2 { } {% endif %} -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for {{ self_t }} { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!({{ self_t }})) @@ -2605,7 +2603,6 @@ impl fmt::Debug for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for {{ self_t }} { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/codegen/templates/quat.rs.tera b/codegen/templates/quat.rs.tera index 47221e67..62126d0b 100644 --- a/codegen/templates/quat.rs.tera +++ b/codegen/templates/quat.rs.tera @@ -63,7 +63,6 @@ use core::simd::*; use core::arch::aarch64::*; {% endif %} -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{ @@ -1161,7 +1160,6 @@ impl {{ self_t }} { {% endif %} } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for {{ self_t }} { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!({{ self_t }})) @@ -1173,7 +1171,6 @@ impl fmt::Debug for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for {{ self_t }} { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/codegen/templates/vec.rs.tera b/codegen/templates/vec.rs.tera index bacdbc75..7d35cdca 100644 --- a/codegen/templates/vec.rs.tera +++ b/codegen/templates/vec.rs.tera @@ -191,7 +191,6 @@ {% endif %} }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -3841,7 +3840,6 @@ impl IndexMut for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for {{ self_t }} { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { {% if is_float %} @@ -3868,7 +3866,6 @@ impl fmt::Display for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for {{ self_t }} { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!({{ self_t }})) diff --git a/codegen/templates/vec_mask.rs.tera b/codegen/templates/vec_mask.rs.tera index 53f7135e..31989007 100644 --- a/codegen/templates/vec_mask.rs.tera +++ b/codegen/templates/vec_mask.rs.tera @@ -26,7 +26,6 @@ {% set components = ["x", "y", "z", "w"] | slice(end = dim) %} -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -543,7 +542,6 @@ impl From<{{ self_t }}> for {{ simd_t }} { } {% endif %} -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for {{ self_t }} { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -557,7 +555,6 @@ impl fmt::Debug for {{ self_t }} { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for {{ self_t }} { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/bvec2.rs b/src/bool/bvec2.rs index 5ac62cb8..791e1921 100644 --- a/src/bool/bvec2.rs +++ b/src/bool/bvec2.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -183,7 +182,6 @@ impl Not for BVec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -191,7 +189,6 @@ impl fmt::Debug for BVec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/bvec3.rs b/src/bool/bvec3.rs index 94fd2b91..5807f984 100644 --- a/src/bool/bvec3.rs +++ b/src/bool/bvec3.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -194,7 +193,6 @@ impl Not for BVec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -209,7 +207,6 @@ impl fmt::Debug for BVec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/bvec4.rs b/src/bool/bvec4.rs index c1f49313..0bc7528d 100644 --- a/src/bool/bvec4.rs +++ b/src/bool/bvec4.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -202,7 +201,6 @@ impl Not for BVec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -218,7 +216,6 @@ impl fmt::Debug for BVec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/coresimd/bvec3a.rs b/src/bool/coresimd/bvec3a.rs index 4615fb48..8347ec87 100644 --- a/src/bool/coresimd/bvec3a.rs +++ b/src/bool/coresimd/bvec3a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -204,7 +203,6 @@ impl From for mask32x4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -219,7 +217,6 @@ impl fmt::Debug for BVec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/coresimd/bvec4a.rs b/src/bool/coresimd/bvec4a.rs index dc65730f..42bff3e4 100644 --- a/src/bool/coresimd/bvec4a.rs +++ b/src/bool/coresimd/bvec4a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -215,7 +214,6 @@ impl From for mask32x4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -231,7 +229,6 @@ impl fmt::Debug for BVec4A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/neon/bvec3a.rs b/src/bool/neon/bvec3a.rs index 7672a187..7a7bdbf6 100644 --- a/src/bool/neon/bvec3a.rs +++ b/src/bool/neon/bvec3a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -223,7 +222,6 @@ impl From for uint32x4_t { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -238,7 +236,6 @@ impl fmt::Debug for BVec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/neon/bvec4a.rs b/src/bool/neon/bvec4a.rs index c8a1700e..2b2f40a9 100644 --- a/src/bool/neon/bvec4a.rs +++ b/src/bool/neon/bvec4a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -234,7 +233,6 @@ impl From for uint32x4_t { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -250,7 +248,6 @@ impl fmt::Debug for BVec4A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/scalar/bvec3a.rs b/src/bool/scalar/bvec3a.rs index bd687af6..ff18a6c6 100644 --- a/src/bool/scalar/bvec3a.rs +++ b/src/bool/scalar/bvec3a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -198,7 +197,6 @@ impl Not for BVec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -213,7 +211,6 @@ impl fmt::Debug for BVec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/scalar/bvec4a.rs b/src/bool/scalar/bvec4a.rs index 82b46401..d3eaf11c 100644 --- a/src/bool/scalar/bvec4a.rs +++ b/src/bool/scalar/bvec4a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -207,7 +206,6 @@ impl Not for BVec4A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -223,7 +221,6 @@ impl fmt::Debug for BVec4A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/sse2/bvec3a.rs b/src/bool/sse2/bvec3a.rs index 5c1943d3..8883f8f5 100644 --- a/src/bool/sse2/bvec3a.rs +++ b/src/bool/sse2/bvec3a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -215,7 +214,6 @@ impl From for __m128 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -230,7 +228,6 @@ impl fmt::Debug for BVec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/sse2/bvec4a.rs b/src/bool/sse2/bvec4a.rs index 9ea076d9..c12d0f88 100644 --- a/src/bool/sse2/bvec4a.rs +++ b/src/bool/sse2/bvec4a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -227,7 +226,6 @@ impl From for __m128 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -243,7 +241,6 @@ impl fmt::Debug for BVec4A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/wasm32/bvec3a.rs b/src/bool/wasm32/bvec3a.rs index 5e889a23..cfeedf89 100644 --- a/src/bool/wasm32/bvec3a.rs +++ b/src/bool/wasm32/bvec3a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -206,7 +205,6 @@ impl From for v128 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -221,7 +219,6 @@ impl fmt::Debug for BVec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/bool/wasm32/bvec4a.rs b/src/bool/wasm32/bvec4a.rs index 65438a12..792c5fb4 100644 --- a/src/bool/wasm32/bvec4a.rs +++ b/src/bool/wasm32/bvec4a.rs @@ -1,6 +1,5 @@ // Generated from vec_mask.rs.tera template. Edit the template, not the generated file. -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::ops::*; @@ -213,7 +212,6 @@ impl From for v128 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_u32_array(); @@ -229,7 +227,6 @@ impl fmt::Debug for BVec4A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for BVec4A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let arr = self.into_bool_array(); diff --git a/src/f32/affine2.rs b/src/f32/affine2.rs index 6e1c5b63..b41db499 100644 --- a/src/f32/affine2.rs +++ b/src/f32/affine2.rs @@ -50,8 +50,8 @@ impl Affine2 { #[must_use] pub fn from_cols_array(m: &[f32; 6]) -> Self { Self { - matrix2: Mat2::from_cols_slice(&m[0..4]), - translation: Vec2::from_slice(&m[4..6]), + matrix2: Mat2::from_cols_array(&[m[0], m[1], m[2], m[3]]), + translation: Vec2::from_array([m[4], m[5]]), } } @@ -344,7 +344,6 @@ impl PartialEq for Affine2 { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Debug for Affine2 { fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fmt.debug_struct(stringify!(Affine2)) @@ -354,7 +353,6 @@ impl core::fmt::Debug for Affine2 { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Display for Affine2 { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/affine3a.rs b/src/f32/affine3a.rs index a02e3926..81101016 100644 --- a/src/f32/affine3a.rs +++ b/src/f32/affine3a.rs @@ -52,8 +52,10 @@ impl Affine3A { #[must_use] pub fn from_cols_array(m: &[f32; 12]) -> Self { Self { - matrix3: Mat3A::from_cols_slice(&m[0..9]), - translation: Vec3A::from_slice(&m[9..12]), + matrix3: Mat3A::from_cols_array(&[ + m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], + ]), + translation: Vec3A::from_array([m[9], m[10], m[11]]), } } @@ -486,7 +488,6 @@ impl PartialEq for Affine3A { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Debug for Affine3A { fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fmt.debug_struct(stringify!(Affine3A)) @@ -496,7 +497,6 @@ impl core::fmt::Debug for Affine3A { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Display for Affine3A { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/coresimd/mat2.rs b/src/f32/coresimd/mat2.rs index ffcb3ea4..440b7223 100644 --- a/src/f32/coresimd/mat2.rs +++ b/src/f32/coresimd/mat2.rs @@ -1,7 +1,6 @@ // Generated from mat.rs.tera template. Edit the template, not the generated file. use crate::{f32::math, swizzles::*, DMat2, Mat3, Mat3A, Vec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -563,7 +562,6 @@ impl core::ops::DerefMut for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat2)) @@ -573,7 +571,6 @@ impl fmt::Debug for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/coresimd/mat3a.rs b/src/f32/coresimd/mat3a.rs index 6e6b29ea..afeb5b88 100644 --- a/src/f32/coresimd/mat3a.rs +++ b/src/f32/coresimd/mat3a.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, EulerRot, Mat2, Mat3, Mat4, Quat, Vec2, Vec3, Vec3A, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -902,7 +901,6 @@ impl PartialEq for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat3A)) @@ -913,7 +911,6 @@ impl fmt::Debug for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/coresimd/mat4.rs b/src/f32/coresimd/mat4.rs index 2f106d77..66d212b1 100644 --- a/src/f32/coresimd/mat4.rs +++ b/src/f32/coresimd/mat4.rs @@ -7,7 +7,6 @@ use crate::{ swizzles::*, DMat4, EulerRot, Mat3, Mat3A, Quat, Vec3, Vec3A, Vec4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -1459,7 +1458,6 @@ impl AsMut<[f32; 16]> for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat4)) @@ -1471,7 +1469,6 @@ impl fmt::Debug for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/coresimd/quat.rs b/src/f32/coresimd/quat.rs index ffcafe74..af79bed2 100644 --- a/src/f32/coresimd/quat.rs +++ b/src/f32/coresimd/quat.rs @@ -9,7 +9,6 @@ use crate::{ use core::simd::*; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, Deref, DerefMut, Div, Mul, MulAssign, Neg, Sub}; @@ -781,7 +780,6 @@ impl Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Quat { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Quat)) @@ -793,7 +791,6 @@ impl fmt::Debug for Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Quat { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/coresimd/vec3a.rs b/src/f32/coresimd/vec3a.rs index 36fdeb55..790e755e 100644 --- a/src/f32/coresimd/vec3a.rs +++ b/src/f32/coresimd/vec3a.rs @@ -2,7 +2,6 @@ use crate::{coresimd::*, f32::math, BVec3, BVec3A, Vec2, Vec3, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1712,7 +1711,6 @@ impl IndexMut for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1723,7 +1721,6 @@ impl fmt::Display for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec3A)) diff --git a/src/f32/coresimd/vec4.rs b/src/f32/coresimd/vec4.rs index 232dfbdf..9eee8f88 100644 --- a/src/f32/coresimd/vec4.rs +++ b/src/f32/coresimd/vec4.rs @@ -2,7 +2,6 @@ use crate::{coresimd::*, f32::math, BVec4, BVec4A, Vec2, Vec3, Vec3A}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1632,7 +1631,6 @@ impl IndexMut for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1647,7 +1645,6 @@ impl fmt::Display for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec4)) diff --git a/src/f32/mat3.rs b/src/f32/mat3.rs index ba22c329..131a71ff 100644 --- a/src/f32/mat3.rs +++ b/src/f32/mat3.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, EulerRot, Mat2, Mat3A, Mat4, Quat, Vec2, Vec3, Vec3A, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -848,7 +847,6 @@ impl AsMut<[f32; 9]> for Mat3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat3)) @@ -859,7 +857,6 @@ impl fmt::Debug for Mat3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/neon/mat2.rs b/src/f32/neon/mat2.rs index e1b0d803..ed3140c3 100644 --- a/src/f32/neon/mat2.rs +++ b/src/f32/neon/mat2.rs @@ -1,7 +1,6 @@ // Generated from mat.rs.tera template. Edit the template, not the generated file. use crate::{f32::math, swizzles::*, DMat2, Mat3, Mat3A, Vec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -605,7 +604,6 @@ impl core::ops::DerefMut for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat2)) @@ -615,7 +613,6 @@ impl fmt::Debug for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/neon/mat3a.rs b/src/f32/neon/mat3a.rs index 3e2448db..6fa85638 100644 --- a/src/f32/neon/mat3a.rs +++ b/src/f32/neon/mat3a.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, EulerRot, Mat2, Mat3, Mat4, Quat, Vec2, Vec3, Vec3A, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -913,7 +912,6 @@ impl PartialEq for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat3A)) @@ -924,7 +922,6 @@ impl fmt::Debug for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/neon/mat4.rs b/src/f32/neon/mat4.rs index 0c6dd74d..a56526c1 100644 --- a/src/f32/neon/mat4.rs +++ b/src/f32/neon/mat4.rs @@ -7,7 +7,6 @@ use crate::{ swizzles::*, DMat4, EulerRot, Mat3, Mat3A, Quat, Vec3, Vec3A, Vec4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -1464,7 +1463,6 @@ impl AsMut<[f32; 16]> for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat4)) @@ -1476,7 +1474,6 @@ impl fmt::Debug for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/neon/quat.rs b/src/f32/neon/quat.rs index 414aa7ab..19787dc3 100644 --- a/src/f32/neon/quat.rs +++ b/src/f32/neon/quat.rs @@ -9,7 +9,6 @@ use crate::{ use core::arch::aarch64::*; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, Deref, DerefMut, Div, Mul, MulAssign, Neg, Sub}; @@ -803,7 +802,6 @@ impl Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Quat { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Quat)) @@ -815,7 +813,6 @@ impl fmt::Debug for Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Quat { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/neon/vec3a.rs b/src/f32/neon/vec3a.rs index 8e07e7fd..f9ba7f0a 100644 --- a/src/f32/neon/vec3a.rs +++ b/src/f32/neon/vec3a.rs @@ -2,7 +2,6 @@ use crate::{f32::math, neon::*, BVec3, BVec3A, Vec2, Vec3, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1769,7 +1768,6 @@ impl IndexMut for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1780,7 +1778,6 @@ impl fmt::Display for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec3A)) diff --git a/src/f32/neon/vec4.rs b/src/f32/neon/vec4.rs index 864abed7..ef897fe3 100644 --- a/src/f32/neon/vec4.rs +++ b/src/f32/neon/vec4.rs @@ -2,7 +2,6 @@ use crate::{f32::math, neon::*, BVec4, BVec4A, Vec2, Vec3, Vec3A}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1681,7 +1680,6 @@ impl IndexMut for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1696,7 +1694,6 @@ impl fmt::Display for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec4)) diff --git a/src/f32/scalar/mat2.rs b/src/f32/scalar/mat2.rs index 3f6dfdc6..f650c699 100644 --- a/src/f32/scalar/mat2.rs +++ b/src/f32/scalar/mat2.rs @@ -1,7 +1,6 @@ // Generated from mat.rs.tera template. Edit the template, not the generated file. use crate::{f32::math, swizzles::*, DMat2, Mat3, Mat3A, Vec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -544,7 +543,6 @@ impl AsMut<[f32; 4]> for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat2)) @@ -554,7 +552,6 @@ impl fmt::Debug for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/scalar/mat3a.rs b/src/f32/scalar/mat3a.rs index 7bcb7679..94b8cc76 100644 --- a/src/f32/scalar/mat3a.rs +++ b/src/f32/scalar/mat3a.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, EulerRot, Mat2, Mat3, Mat4, Quat, Vec2, Vec3, Vec3A, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -900,7 +899,6 @@ impl PartialEq for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat3A)) @@ -911,7 +909,6 @@ impl fmt::Debug for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/scalar/mat4.rs b/src/f32/scalar/mat4.rs index beec9b84..ccbc96d8 100644 --- a/src/f32/scalar/mat4.rs +++ b/src/f32/scalar/mat4.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat4, EulerRot, Mat3, Mat3A, Quat, Vec3, Vec3A, Vec4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -1372,7 +1371,6 @@ impl AsMut<[f32; 16]> for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat4)) @@ -1384,7 +1382,6 @@ impl fmt::Debug for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/scalar/quat.rs b/src/f32/scalar/quat.rs index cadeca78..8db0479f 100644 --- a/src/f32/scalar/quat.rs +++ b/src/f32/scalar/quat.rs @@ -6,7 +6,6 @@ use crate::{ DQuat, Mat3, Mat3A, Mat4, Vec2, Vec3, Vec3A, Vec4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, Div, Mul, MulAssign, Neg, Sub}; @@ -763,7 +762,6 @@ impl Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Quat { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Quat)) @@ -775,7 +773,6 @@ impl fmt::Debug for Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Quat { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/scalar/vec3a.rs b/src/f32/scalar/vec3a.rs index 001ad4b9..601e9bbd 100644 --- a/src/f32/scalar/vec3a.rs +++ b/src/f32/scalar/vec3a.rs @@ -2,7 +2,6 @@ use crate::{f32::math, BVec3, BVec3A, Vec2, Vec3, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1846,7 +1845,6 @@ impl IndexMut for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1857,7 +1855,6 @@ impl fmt::Display for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec3A)) diff --git a/src/f32/scalar/vec4.rs b/src/f32/scalar/vec4.rs index e3205436..9246387f 100644 --- a/src/f32/scalar/vec4.rs +++ b/src/f32/scalar/vec4.rs @@ -7,7 +7,6 @@ use crate::BVec4 as BVec4A; use crate::BVec4A; use crate::{f32::math, BVec4, Vec2, Vec3, Vec3A}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1866,7 +1865,6 @@ impl IndexMut for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1881,7 +1879,6 @@ impl fmt::Display for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec4)) diff --git a/src/f32/sse2/mat2.rs b/src/f32/sse2/mat2.rs index 8821006d..64e098ae 100644 --- a/src/f32/sse2/mat2.rs +++ b/src/f32/sse2/mat2.rs @@ -1,7 +1,6 @@ // Generated from mat.rs.tera template. Edit the template, not the generated file. use crate::{f32::math, swizzles::*, DMat2, Mat3, Mat3A, Vec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -595,7 +594,6 @@ impl core::ops::DerefMut for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat2)) @@ -605,7 +603,6 @@ impl fmt::Debug for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/sse2/mat3a.rs b/src/f32/sse2/mat3a.rs index c6e6ad2f..9eb64b8d 100644 --- a/src/f32/sse2/mat3a.rs +++ b/src/f32/sse2/mat3a.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, EulerRot, Mat2, Mat3, Mat4, Quat, Vec2, Vec3, Vec3A, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -907,7 +906,6 @@ impl PartialEq for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat3A)) @@ -918,7 +916,6 @@ impl fmt::Debug for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/sse2/mat4.rs b/src/f32/sse2/mat4.rs index 81900f83..cef52bc0 100644 --- a/src/f32/sse2/mat4.rs +++ b/src/f32/sse2/mat4.rs @@ -7,7 +7,6 @@ use crate::{ swizzles::*, DMat4, EulerRot, Mat3, Mat3A, Quat, Vec3, Vec3A, Vec4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -1468,7 +1467,6 @@ impl AsMut<[f32; 16]> for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat4)) @@ -1480,7 +1478,6 @@ impl fmt::Debug for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/sse2/quat.rs b/src/f32/sse2/quat.rs index 181e3f43..653cd5b7 100644 --- a/src/f32/sse2/quat.rs +++ b/src/f32/sse2/quat.rs @@ -12,7 +12,6 @@ use core::arch::x86::*; #[cfg(target_arch = "x86_64")] use core::arch::x86_64::*; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, Deref, DerefMut, Div, Mul, MulAssign, Neg, Sub}; @@ -811,7 +810,6 @@ impl Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Quat { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Quat)) @@ -823,7 +821,6 @@ impl fmt::Debug for Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Quat { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/sse2/vec3a.rs b/src/f32/sse2/vec3a.rs index 12ecbb47..23181e22 100644 --- a/src/f32/sse2/vec3a.rs +++ b/src/f32/sse2/vec3a.rs @@ -2,7 +2,6 @@ use crate::{f32::math, sse2::*, BVec3, BVec3A, Vec2, Vec3, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1777,7 +1776,6 @@ impl IndexMut for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1788,7 +1786,6 @@ impl fmt::Display for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec3A)) diff --git a/src/f32/sse2/vec4.rs b/src/f32/sse2/vec4.rs index 25a54523..c1421823 100644 --- a/src/f32/sse2/vec4.rs +++ b/src/f32/sse2/vec4.rs @@ -2,7 +2,6 @@ use crate::{f32::math, sse2::*, BVec4, BVec4A, Vec2, Vec3, Vec3A}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1699,7 +1698,6 @@ impl IndexMut for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1714,7 +1712,6 @@ impl fmt::Display for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec4)) diff --git a/src/f32/vec2.rs b/src/f32/vec2.rs index 0427ea6e..ed945388 100644 --- a/src/f32/vec2.rs +++ b/src/f32/vec2.rs @@ -2,7 +2,6 @@ use crate::{f32::math, BVec2, Vec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1767,7 +1766,6 @@ impl IndexMut for Vec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1778,7 +1776,6 @@ impl fmt::Display for Vec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec2)) diff --git a/src/f32/vec3.rs b/src/f32/vec3.rs index bb40eb1c..cf56153c 100644 --- a/src/f32/vec3.rs +++ b/src/f32/vec3.rs @@ -2,7 +2,6 @@ use crate::{f32::math, BVec3, BVec3A, Vec2, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1836,7 +1835,6 @@ impl IndexMut for Vec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1847,7 +1845,6 @@ impl fmt::Display for Vec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec3)) diff --git a/src/f32/wasm32/mat2.rs b/src/f32/wasm32/mat2.rs index 59bd5e7a..2225c948 100644 --- a/src/f32/wasm32/mat2.rs +++ b/src/f32/wasm32/mat2.rs @@ -1,7 +1,6 @@ // Generated from mat.rs.tera template. Edit the template, not the generated file. use crate::{f32::math, swizzles::*, DMat2, Mat3, Mat3A, Vec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -569,7 +568,6 @@ impl core::ops::DerefMut for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat2)) @@ -579,7 +577,6 @@ impl fmt::Debug for Mat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/wasm32/mat3a.rs b/src/f32/wasm32/mat3a.rs index bbaffd62..0bf3d67d 100644 --- a/src/f32/wasm32/mat3a.rs +++ b/src/f32/wasm32/mat3a.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, EulerRot, Mat2, Mat3, Mat4, Quat, Vec2, Vec3, Vec3A, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -902,7 +901,6 @@ impl PartialEq for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat3A)) @@ -913,7 +911,6 @@ impl fmt::Debug for Mat3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/wasm32/mat4.rs b/src/f32/wasm32/mat4.rs index 290dda35..be87ac95 100644 --- a/src/f32/wasm32/mat4.rs +++ b/src/f32/wasm32/mat4.rs @@ -7,7 +7,6 @@ use crate::{ wasm32::*, DMat4, EulerRot, Mat3, Mat3A, Quat, Vec3, Vec3A, Vec4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -1459,7 +1458,6 @@ impl AsMut<[f32; 16]> for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Mat4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(Mat4)) @@ -1471,7 +1469,6 @@ impl fmt::Debug for Mat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Mat4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/wasm32/quat.rs b/src/f32/wasm32/quat.rs index 0055c012..c7c21b1d 100644 --- a/src/f32/wasm32/quat.rs +++ b/src/f32/wasm32/quat.rs @@ -9,7 +9,6 @@ use crate::{ use core::arch::wasm32::*; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, Deref, DerefMut, Div, Mul, MulAssign, Neg, Sub}; @@ -783,7 +782,6 @@ impl Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Quat { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Quat)) @@ -795,7 +793,6 @@ impl fmt::Debug for Quat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Quat { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f32/wasm32/vec3a.rs b/src/f32/wasm32/vec3a.rs index 83338544..44d93d95 100644 --- a/src/f32/wasm32/vec3a.rs +++ b/src/f32/wasm32/vec3a.rs @@ -2,7 +2,6 @@ use crate::{f32::math, wasm32::*, BVec3, BVec3A, Vec2, Vec3, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1738,7 +1737,6 @@ impl IndexMut for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec3A { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1749,7 +1747,6 @@ impl fmt::Display for Vec3A { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec3A { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec3A)) diff --git a/src/f32/wasm32/vec4.rs b/src/f32/wasm32/vec4.rs index 9f1d3784..b950c0e0 100644 --- a/src/f32/wasm32/vec4.rs +++ b/src/f32/wasm32/vec4.rs @@ -2,7 +2,6 @@ use crate::{f32::math, wasm32::*, BVec4, BVec4A, Vec2, Vec3, Vec3A}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1667,7 +1666,6 @@ impl IndexMut for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1682,7 +1680,6 @@ impl fmt::Display for Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(Vec4)) diff --git a/src/f64/daffine2.rs b/src/f64/daffine2.rs index 2853dd23..fd29d5e9 100644 --- a/src/f64/daffine2.rs +++ b/src/f64/daffine2.rs @@ -50,8 +50,8 @@ impl DAffine2 { #[must_use] pub fn from_cols_array(m: &[f64; 6]) -> Self { Self { - matrix2: DMat2::from_cols_slice(&m[0..4]), - translation: DVec2::from_slice(&m[4..6]), + matrix2: DMat2::from_cols_array(&[m[0], m[1], m[2], m[3]]), + translation: DVec2::from_array([m[4], m[5]]), } } @@ -333,7 +333,6 @@ impl PartialEq for DAffine2 { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Debug for DAffine2 { fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fmt.debug_struct(stringify!(DAffine2)) @@ -343,7 +342,6 @@ impl core::fmt::Debug for DAffine2 { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Display for DAffine2 { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f64/daffine3.rs b/src/f64/daffine3.rs index c5ceb08f..25459ac7 100644 --- a/src/f64/daffine3.rs +++ b/src/f64/daffine3.rs @@ -50,8 +50,10 @@ impl DAffine3 { #[must_use] pub fn from_cols_array(m: &[f64; 12]) -> Self { Self { - matrix3: DMat3::from_cols_slice(&m[0..9]), - translation: DVec3::from_slice(&m[9..12]), + matrix3: DMat3::from_cols_array(&[ + m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], + ]), + translation: DVec3::from_array([m[9], m[10], m[11]]), } } @@ -471,7 +473,6 @@ impl PartialEq for DAffine3 { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Debug for DAffine3 { fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fmt.debug_struct(stringify!(DAffine3)) @@ -481,7 +482,6 @@ impl core::fmt::Debug for DAffine3 { } } -#[cfg(not(target_arch = "spirv"))] impl core::fmt::Display for DAffine3 { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f64/dmat2.rs b/src/f64/dmat2.rs index 5798c513..2cf90d2e 100644 --- a/src/f64/dmat2.rs +++ b/src/f64/dmat2.rs @@ -1,7 +1,6 @@ // Generated from mat.rs.tera template. Edit the template, not the generated file. use crate::{f64::math, swizzles::*, DMat3, DVec2, Mat2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -510,7 +509,6 @@ impl AsMut<[f64; 4]> for DMat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DMat2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(DMat2)) @@ -520,7 +518,6 @@ impl fmt::Debug for DMat2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DMat2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f64/dmat3.rs b/src/f64/dmat3.rs index 4f84b1a5..f5e99a39 100644 --- a/src/f64/dmat3.rs +++ b/src/f64/dmat3.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat2, DMat4, DQuat, DVec2, DVec3, EulerRot, Mat3, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -826,7 +825,6 @@ impl AsMut<[f64; 9]> for DMat3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DMat3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(DMat3)) @@ -837,7 +835,6 @@ impl fmt::Debug for DMat3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DMat3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f64/dmat4.rs b/src/f64/dmat4.rs index 82c0071f..e8cb013a 100644 --- a/src/f64/dmat4.rs +++ b/src/f64/dmat4.rs @@ -6,7 +6,6 @@ use crate::{ swizzles::*, DMat3, DQuat, DVec3, DVec4, EulerRot, Mat4, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign}; @@ -1336,7 +1335,6 @@ impl AsMut<[f64; 16]> for DMat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DMat4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_struct(stringify!(DMat4)) @@ -1348,7 +1346,6 @@ impl fmt::Debug for DMat4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DMat4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f64/dquat.rs b/src/f64/dquat.rs index a5f48192..6c7d7670 100644 --- a/src/f64/dquat.rs +++ b/src/f64/dquat.rs @@ -6,7 +6,6 @@ use crate::{ DMat3, DMat4, DVec2, DVec3, DVec4, Quat, }; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::ops::{Add, Div, Mul, MulAssign, Neg, Sub}; @@ -738,7 +737,6 @@ impl DQuat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DQuat { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(DQuat)) @@ -750,7 +748,6 @@ impl fmt::Debug for DQuat { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DQuat { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { diff --git a/src/f64/dvec2.rs b/src/f64/dvec2.rs index 34a69bbc..66d87675 100644 --- a/src/f64/dvec2.rs +++ b/src/f64/dvec2.rs @@ -2,7 +2,6 @@ use crate::{f64::math, BVec2, DVec3, IVec2, UVec2, Vec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1767,7 +1766,6 @@ impl IndexMut for DVec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DVec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1778,7 +1776,6 @@ impl fmt::Display for DVec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DVec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(DVec2)) diff --git a/src/f64/dvec3.rs b/src/f64/dvec3.rs index ee8fdf88..23698185 100644 --- a/src/f64/dvec3.rs +++ b/src/f64/dvec3.rs @@ -2,7 +2,6 @@ use crate::{f64::math, BVec3, BVec3A, DVec2, DVec4, IVec3, UVec3, Vec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1843,7 +1842,6 @@ impl IndexMut for DVec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DVec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1854,7 +1852,6 @@ impl fmt::Display for DVec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DVec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(DVec3)) diff --git a/src/f64/dvec4.rs b/src/f64/dvec4.rs index 0e3b1992..a99b0ab1 100644 --- a/src/f64/dvec4.rs +++ b/src/f64/dvec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{f64::math, BVec4, DVec2, DVec3, IVec4, UVec4, Vec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1855,7 +1854,6 @@ impl IndexMut for DVec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for DVec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(p) = f.precision() { @@ -1870,7 +1868,6 @@ impl fmt::Display for DVec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for DVec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(DVec4)) diff --git a/src/i16/i16vec2.rs b/src/i16/i16vec2.rs index a10f8e4e..a3758c98 100644 --- a/src/i16/i16vec2.rs +++ b/src/i16/i16vec2.rs @@ -2,7 +2,6 @@ use crate::{BVec2, I16Vec3, I64Vec2, IVec2, U16Vec2, U64Vec2, UVec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1682,14 +1681,12 @@ impl IndexMut for I16Vec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for I16Vec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}]", self.x, self.y) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for I16Vec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(I16Vec2)) diff --git a/src/i16/i16vec3.rs b/src/i16/i16vec3.rs index b87313d0..e7dcbd5c 100644 --- a/src/i16/i16vec3.rs +++ b/src/i16/i16vec3.rs @@ -2,7 +2,6 @@ use crate::{BVec3, BVec3A, I16Vec2, I16Vec4, I64Vec3, IVec3, U16Vec3, U64Vec3, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1786,14 +1785,12 @@ impl IndexMut for I16Vec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for I16Vec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}]", self.x, self.y, self.z) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for I16Vec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(I16Vec3)) diff --git a/src/i16/i16vec4.rs b/src/i16/i16vec4.rs index 35289af7..70bba937 100644 --- a/src/i16/i16vec4.rs +++ b/src/i16/i16vec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{BVec4, I16Vec2, I16Vec3, I64Vec4, IVec4, U16Vec4, U64Vec4, UVec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1881,14 +1880,12 @@ impl IndexMut for I16Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for I16Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for I16Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(I16Vec4)) diff --git a/src/i32/ivec2.rs b/src/i32/ivec2.rs index 8c1fea72..140c33ac 100644 --- a/src/i32/ivec2.rs +++ b/src/i32/ivec2.rs @@ -2,7 +2,6 @@ use crate::{BVec2, I16Vec2, I64Vec2, IVec3, U16Vec2, U64Vec2, UVec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1682,14 +1681,12 @@ impl IndexMut for IVec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for IVec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}]", self.x, self.y) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for IVec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(IVec2)) diff --git a/src/i32/ivec3.rs b/src/i32/ivec3.rs index eb015eca..afd0252c 100644 --- a/src/i32/ivec3.rs +++ b/src/i32/ivec3.rs @@ -2,7 +2,6 @@ use crate::{BVec3, BVec3A, I16Vec3, I64Vec3, IVec2, IVec4, U16Vec3, U64Vec3, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1786,14 +1785,12 @@ impl IndexMut for IVec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for IVec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}]", self.x, self.y, self.z) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for IVec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(IVec3)) diff --git a/src/i32/ivec4.rs b/src/i32/ivec4.rs index 3f04d3c1..f76b89f9 100644 --- a/src/i32/ivec4.rs +++ b/src/i32/ivec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{BVec4, I16Vec4, I64Vec4, IVec2, IVec3, U16Vec4, U64Vec4, UVec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1881,14 +1880,12 @@ impl IndexMut for IVec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for IVec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for IVec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(IVec4)) diff --git a/src/i64/i64vec2.rs b/src/i64/i64vec2.rs index 4d3d1222..a6d70399 100644 --- a/src/i64/i64vec2.rs +++ b/src/i64/i64vec2.rs @@ -2,7 +2,6 @@ use crate::{BVec2, I16Vec2, I64Vec3, IVec2, U16Vec2, U64Vec2, UVec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1682,14 +1681,12 @@ impl IndexMut for I64Vec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for I64Vec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}]", self.x, self.y) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for I64Vec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(I64Vec2)) diff --git a/src/i64/i64vec3.rs b/src/i64/i64vec3.rs index 561a32ad..ee261753 100644 --- a/src/i64/i64vec3.rs +++ b/src/i64/i64vec3.rs @@ -2,7 +2,6 @@ use crate::{BVec3, BVec3A, I16Vec3, I64Vec2, I64Vec4, IVec3, U16Vec3, U64Vec3, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1786,14 +1785,12 @@ impl IndexMut for I64Vec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for I64Vec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}]", self.x, self.y, self.z) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for I64Vec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(I64Vec3)) diff --git a/src/i64/i64vec4.rs b/src/i64/i64vec4.rs index f3ea7e98..50da7ebd 100644 --- a/src/i64/i64vec4.rs +++ b/src/i64/i64vec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{BVec4, I16Vec4, I64Vec2, I64Vec3, IVec4, U16Vec4, U64Vec4, UVec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1881,14 +1880,12 @@ impl IndexMut for I64Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for I64Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for I64Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(I64Vec4)) diff --git a/src/u16/u16vec2.rs b/src/u16/u16vec2.rs index 54807c83..6df5f710 100644 --- a/src/u16/u16vec2.rs +++ b/src/u16/u16vec2.rs @@ -2,7 +2,6 @@ use crate::{BVec2, I16Vec2, I64Vec2, IVec2, U16Vec3, U64Vec2, UVec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1534,14 +1533,12 @@ impl IndexMut for U16Vec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for U16Vec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}]", self.x, self.y) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for U16Vec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(U16Vec2)) diff --git a/src/u16/u16vec3.rs b/src/u16/u16vec3.rs index 9886209d..e83180a0 100644 --- a/src/u16/u16vec3.rs +++ b/src/u16/u16vec3.rs @@ -2,7 +2,6 @@ use crate::{BVec3, BVec3A, I16Vec3, I64Vec3, IVec3, U16Vec2, U16Vec4, U64Vec3, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1653,14 +1652,12 @@ impl IndexMut for U16Vec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for U16Vec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}]", self.x, self.y, self.z) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for U16Vec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(U16Vec3)) diff --git a/src/u16/u16vec4.rs b/src/u16/u16vec4.rs index 723b5ea2..3e74dd4b 100644 --- a/src/u16/u16vec4.rs +++ b/src/u16/u16vec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{BVec4, I16Vec4, I64Vec4, IVec4, U16Vec2, U16Vec3, U64Vec4, UVec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1737,14 +1736,12 @@ impl IndexMut for U16Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for U16Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for U16Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(U16Vec4)) diff --git a/src/u32/uvec2.rs b/src/u32/uvec2.rs index 3958d165..edce7d88 100644 --- a/src/u32/uvec2.rs +++ b/src/u32/uvec2.rs @@ -2,7 +2,6 @@ use crate::{BVec2, I16Vec2, I64Vec2, IVec2, U16Vec2, U64Vec2, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1534,14 +1533,12 @@ impl IndexMut for UVec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for UVec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}]", self.x, self.y) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for UVec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(UVec2)) diff --git a/src/u32/uvec3.rs b/src/u32/uvec3.rs index 8f4963af..1ef55022 100644 --- a/src/u32/uvec3.rs +++ b/src/u32/uvec3.rs @@ -2,7 +2,6 @@ use crate::{BVec3, BVec3A, I16Vec3, I64Vec3, IVec3, U16Vec3, U64Vec3, UVec2, UVec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1653,14 +1652,12 @@ impl IndexMut for UVec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for UVec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}]", self.x, self.y, self.z) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for UVec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(UVec3)) diff --git a/src/u32/uvec4.rs b/src/u32/uvec4.rs index 8634e51b..394d4202 100644 --- a/src/u32/uvec4.rs +++ b/src/u32/uvec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{BVec4, I16Vec4, I64Vec4, IVec4, U16Vec4, U64Vec4, UVec2, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1737,14 +1736,12 @@ impl IndexMut for UVec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for UVec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for UVec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(UVec4)) diff --git a/src/u64/u64vec2.rs b/src/u64/u64vec2.rs index 2d339e2e..9b208ebe 100644 --- a/src/u64/u64vec2.rs +++ b/src/u64/u64vec2.rs @@ -2,7 +2,6 @@ use crate::{BVec2, I16Vec2, I64Vec2, IVec2, U16Vec2, U64Vec3, UVec2}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1534,14 +1533,12 @@ impl IndexMut for U64Vec2 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for U64Vec2 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}]", self.x, self.y) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for U64Vec2 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(U64Vec2)) diff --git a/src/u64/u64vec3.rs b/src/u64/u64vec3.rs index e5fb91e3..d2e3f814 100644 --- a/src/u64/u64vec3.rs +++ b/src/u64/u64vec3.rs @@ -2,7 +2,6 @@ use crate::{BVec3, BVec3A, I16Vec3, I64Vec3, IVec3, U16Vec3, U64Vec2, U64Vec4, UVec3}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1653,14 +1652,12 @@ impl IndexMut for U64Vec3 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for U64Vec3 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}]", self.x, self.y, self.z) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for U64Vec3 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(U64Vec3)) diff --git a/src/u64/u64vec4.rs b/src/u64/u64vec4.rs index 1d161050..b6374507 100644 --- a/src/u64/u64vec4.rs +++ b/src/u64/u64vec4.rs @@ -4,7 +4,6 @@ use crate::BVec4A; use crate::{BVec4, I16Vec4, I64Vec4, IVec4, U16Vec4, U64Vec2, U64Vec3, UVec4}; -#[cfg(not(target_arch = "spirv"))] use core::fmt; use core::iter::{Product, Sum}; use core::{f32, ops::*}; @@ -1737,14 +1736,12 @@ impl IndexMut for U64Vec4 { } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Display for U64Vec4 { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w) } } -#[cfg(not(target_arch = "spirv"))] impl fmt::Debug for U64Vec4 { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt.debug_tuple(stringify!(U64Vec4))