Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Display impl respect formatting parameters #58

Merged
merged 6 commits into from
Aug 2, 2020
Merged

Make Display impl respect formatting parameters #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf2894a
respect formatting parameters in Display
martin-t Jul 28, 2020
894b0cb
improve comment
martin-t Jul 28, 2020
5ab4c93
document format for Display on Vecs
martin-t Jul 30, 2020
782bcfe
make Display on matrices respect formatting params
martin-t Jul 31, 2020
8d75d60
replace macro recursion by iteration through vector elements
martin-t Jul 31, 2020
8460318
add martin-t to readme
martin-t Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ If you plan to work a pull request, please file an issue first so that we can ag
- Joshua Barretto (GitHub: [@zesterer](https://github.com/zesterer))
- Sunjay Varma (GitHub : [@sunjay](https://github.com/sunjay))
- Timo Kösters (GitHub : [@timokoesters](https://github.com/timokoesters))
- Imbris (Github: [@imberflur](https://github.com/imberflur))
- Lukas Wirth (Github: [@veykril](https://github.com/veykril))
- Imbris (GitHub: [@imberflur](https://github.com/imberflur))
- Lukas Wirth (GitHub: [@veykril](https://github.com/veykril))
- Martin Taibr (GitHub: [@martin-t](https://github.com/martin-t))
34 changes: 26 additions & 8 deletions src/mat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,12 +377,21 @@ macro_rules! mat_impl_mat {
impl<T: Display> Display for $Mat<T> {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, "(")?;
for row in &self.rows {
let mut rows = self.rows.iter();
// first row goes after the opening paren
if let Some(row) = rows.next(){
for elem in row {
write!(f, " {}", elem)?;
write!(f, " ")?;
elem.fmt(f)?;
}
}
// subsequent rows start on a new line
for row in rows{
write!(f, "\n ")?;
for elem in row {
write!(f, " ")?;
elem.fmt(f)?;
}
writeln!(f, "")?;
write!(f, " ")?;
}
write!(f, " )")
}
Expand Down Expand Up @@ -897,15 +906,24 @@ macro_rules! mat_impl_mat {
impl<T: Display> Display for $Mat<T> {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, "(")?;
for y in 0..$nrows {
// first row goes after the opening paren
for x in 0..$ncols {
write!(f, " ")?;
let elem = unsafe {
self.cols.get_unchecked(x).get_unchecked(0)
};
elem.fmt(f)?;
}
// subsequent rows start on a new line
for y in 1..$nrows {
write!(f, "\n ")?;
for x in 0..$ncols {
write!(f, " ")?;
let elem = unsafe {
self.cols.get_unchecked(x).get_unchecked(y)
};
write!(f, " {}", elem)?;
elem.fmt(f)?;
}
writeln!(f, "")?;
write!(f, " ")?;
}
write!(f, " )")
}
Expand Down
59 changes: 35 additions & 24 deletions src/vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ macro_rules! vec_impl_unop {
/// Generates implementations specific to the given vector type.
macro_rules! vec_impl_vec {

($c_or_simd:ident tuple $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {
($c_or_simd:ident tuple $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($fmt_prefix:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {

impl<T> $Vec<T> {
/// Creates a vector from elements.
Expand All @@ -256,11 +256,11 @@ macro_rules! vec_impl_vec {
}
}

vec_impl_vec!{common $c_or_simd $Vec $vec ($dim) ($fmt) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
vec_impl_vec!{specific $c_or_simd $Vec $vec ($dim) ($fmt) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
vec_impl_vec!{common $c_or_simd $Vec $vec ($dim) ($fmt) ($fmt_prefix) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
vec_impl_vec!{specific $c_or_simd $Vec $vec ($dim) ($fmt) ($fmt_prefix) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
};

($c_or_simd:ident struct $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {
($c_or_simd:ident struct $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($fmt_prefix:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {

impl<T> $Vec<T> {
/// Creates a vector from elements.
Expand All @@ -270,15 +270,15 @@ macro_rules! vec_impl_vec {
}
}

vec_impl_vec!{common $c_or_simd $Vec $vec ($dim) ($fmt) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
vec_impl_vec!{specific $c_or_simd $Vec $vec ($dim) ($fmt) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
vec_impl_vec!{common $c_or_simd $Vec $vec ($dim) ($fmt) ($fmt_prefix) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
vec_impl_vec!{specific $c_or_simd $Vec $vec ($dim) ($fmt) ($fmt_prefix) ($($get)+) ($($namedget)+) ($($tupleget)+) $Tuple}
};

(specific c $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {
(specific c $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($fmt_prefix:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {

use super::super::repr_c::$vec::$Vec as CVec;
};
(specific simd $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {
(specific simd $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($fmt_prefix:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {

use super::super::repr_c::$vec::$Vec as CVec;

Expand Down Expand Up @@ -324,15 +324,26 @@ macro_rules! vec_impl_vec {
}
}
};
(common $c_or_simd:ident $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {
(common $c_or_simd:ident $Vec:ident $vec:ident ($dim:expr) ($fmt:expr) ($fmt_prefix:expr) ($($get:tt)+) ($($namedget:tt)+) ($($tupleget:tt)+) $Tuple:ty) => {

#[allow(missing_docs)]
/// Displays the vector, formatted as `
#[doc=$fmt]
/// `.
/// ` where `...` are the actual formatting parameters.
impl<T: Display> Display for $Vec<T> {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, $fmt, $(self.$get),+)
write!(f, $fmt_prefix)?;
write!(f, "(")?;
let mut elems = self.iter();
if let Some(elem)=elems.next(){
write!(f, " ")?;
elem.fmt(f)?;
}
for elem in elems {
write!(f, ", ")?;
elem.fmt(f)?;
}
write!(f, " )")
}
}

Expand Down Expand Up @@ -2750,7 +2761,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Vec2<T> { pub x:T, pub y:T }
vec_impl_vec!($c_or_simd struct Vec2 vec2 (2) ("({}, {})") (x y) (x y) (0 1) (T,T));
vec_impl_vec!($c_or_simd struct Vec2 vec2 (2) ("({...}, {...})") ("") (x y) (x y) (0 1) (T,T));
vec_impl_mint!(Vec2, Vector2, (x y));
vec_impl_mint!(Vec2, Point2, (x y));
vec_impl_spatial!(Vec2);
Expand Down Expand Up @@ -2791,7 +2802,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Vec3<T> { pub x:T, pub y:T, pub z:T }
vec_impl_vec!($c_or_simd struct Vec3 vec3 (3) ("({}, {}, {})") (x y z) (x y z) (0 1 2) (T,T,T));
vec_impl_vec!($c_or_simd struct Vec3 vec3 (3) ("({...}, {...}, {...})") ("") (x y z) (x y z) (0 1 2) (T,T,T));
vec_impl_mint!(Vec3, Vector3, (x y z));
vec_impl_mint!(Vec3, Point3, (x y z));
vec_impl_spatial!(Vec3);
Expand Down Expand Up @@ -2857,7 +2868,7 @@ macro_rules! vec_impl_all_vecs {
/// a point stretching infinitely towards another).
pub w: T
}
vec_impl_vec!($c_or_simd struct Vec4 vec4 (4) ("({}, {}, {}, {})") (x y z w) (x y z w) (0 1 2 3) (T,T,T,T));
vec_impl_vec!($c_or_simd struct Vec4 vec4 (4) ("({...}, {...}, {...}, {...})") ("") (x y z w) (x y z w) (0 1 2 3) (T,T,T,T));
vec_impl_mint!(Vec4, Vector4, (x y z w));
vec_impl_spatial!(Vec4);
vec_impl_spatial_4d!(Vec4);
Expand Down Expand Up @@ -2921,7 +2932,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Vec8<T>(pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T);
vec_impl_vec!($c_or_simd tuple Vec8 vec8 (8) ("({}, {}, {}, {}, {}, {}, {}, {})") (0 1 2 3 4 5 6 7) (m0 m1 m2 m3 m4 m5 m6 m7) (0 1 2 3 4 5 6 7) (T,T,T,T,T,T,T,T));
vec_impl_vec!($c_or_simd tuple Vec8 vec8 (8) ("({...}, {...}, {...}, {...}, {...}, {...}, {...}, {...})") ("") (0 1 2 3 4 5 6 7) (m0 m1 m2 m3 m4 m5 m6 m7) (0 1 2 3 4 5 6 7) (T,T,T,T,T,T,T,T));
vec_impl_spatial!(Vec8);
}
#[cfg(feature="vec8")]
Expand All @@ -2943,7 +2954,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Vec16<T>(pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T);
vec_impl_vec!($c_or_simd tuple Vec16 vec16 (16) ("({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})") (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 m10 m11 m12 m13 m14 m15) (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T));
vec_impl_vec!($c_or_simd tuple Vec16 vec16 (16) ("({...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...})") ("") (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 m10 m11 m12 m13 m14 m15) (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15) (T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T));
vec_impl_spatial!(Vec16);
}
#[cfg(feature="vec16")]
Expand All @@ -2965,7 +2976,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Vec32<T>(pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T);
vec_impl_vec!($c_or_simd tuple Vec32 vec32 (32) ("({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})") (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31) (m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 m10 m11 m12 m13 m14 m15 m16 m17 m18 m19 m20 m21 m22 m23 m24 m25 m26 m27 m28 m29 m30 m31) (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31) (T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T));
vec_impl_vec!($c_or_simd tuple Vec32 vec32 (32) ("({...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...})") ("") (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31) (m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 m10 m11 m12 m13 m14 m15 m16 m17 m18 m19 m20 m21 m22 m23 m24 m25 m26 m27 m28 m29 m30 m31) (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31) (T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T));
vec_impl_spatial!(Vec32);
}
#[cfg(feature="vec32")]
Expand All @@ -2988,7 +2999,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Vec64<T>(pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T, pub T);
vec_impl_vec!($c_or_simd tuple Vec64 vec64 (64) ("({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})") (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63) (m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 m10 m11 m12 m13 m14 m15 m16 m17 m18 m19 m20 m21 m22 m23 m24 m25 m26 m27 m28 m29 m30 m31 m32 m33 m34 m35 m36 m37 m38 m39 m40 m41 m42 m43 m44 m45 m46 m47 m48 m49 m50 m51 m52 m53 m54 m55 m56 m57 m58 m59 m60 m61 m62 m63) (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63) (T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T));
vec_impl_vec!($c_or_simd tuple Vec64 vec64 (64) ("({...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...}, {...})") ("") (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63) (m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 m10 m11 m12 m13 m14 m15 m16 m17 m18 m19 m20 m21 m22 m23 m24 m25 m26 m27 m28 m29 m30 m31 m32 m33 m34 m35 m36 m37 m38 m39 m40 m41 m42 m43 m44 m45 m46 m47 m48 m49 m50 m51 m52 m53 m54 m55 m56 m57 m58 m59 m60 m61 m62 m63) (0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63) (T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T,T));
vec_impl_spatial!(Vec64);
}
#[cfg(feature="vec64")]
Expand All @@ -3010,7 +3021,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Extent3<T> { pub w:T, pub h:T, pub d:T }
vec_impl_vec!($c_or_simd struct Extent3 extent3 (3) ("({}, {}, {})") (w h d) (w h d) (0 1 2) (T,T,T));
vec_impl_vec!($c_or_simd struct Extent3 extent3 (3) ("({...}, {...}, {...})") ("") (w h d) (w h d) (0 1 2) (T,T,T));
vec_impl_spatial!(Extent3);

impl<T> From<Vec3<T>> for Extent3<T> {
Expand All @@ -3037,7 +3048,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Extent2<T> { pub w:T, pub h:T }
vec_impl_vec!($c_or_simd struct Extent2 extent2 (2) ("({}, {})") (w h) (w h) (0 1) (T,T));
vec_impl_vec!($c_or_simd struct Extent2 extent2 (2) ("({...}, {...})") ("") (w h) (w h) (0 1) (T,T));
vec_impl_spatial!(Extent2);

impl<T> From<Vec2<T>> for Extent2<T> {
Expand All @@ -3061,7 +3072,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Rgba<T> { pub r:T, pub g:T, pub b:T, pub a:T }
vec_impl_vec!($c_or_simd struct Rgba rgba (4) ("rgba({}, {}, {}, {})") (r g b a) (r g b a) (0 1 2 3) (T,T,T,T));
vec_impl_vec!($c_or_simd struct Rgba rgba (4) ("rgba({...}, {...}, {...}, {...})") ("rgba") (r g b a) (r g b a) (0 1 2 3) (T,T,T,T));
vec_impl_color_rgba!{Rgba}
vec_impl_shuffle_4d!(Rgba (r g b a));

Expand Down Expand Up @@ -3100,7 +3111,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Rgb<T> { pub r:T, pub g:T, pub b:T }
vec_impl_vec!($c_or_simd struct Rgb rgb (3) ("rgb({}, {}, {})") (r g b) (r g b) (0 1 2) (T,T,T));
vec_impl_vec!($c_or_simd struct Rgb rgb (3) ("rgb({...}, {...}, {...})") ("rgb") (r g b) (r g b) (0 1 2) (T,T,T));
vec_impl_color_rgb!{Rgb}

impl<T> From<Vec3<T>> for Rgb<T> {
Expand Down Expand Up @@ -3128,7 +3139,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Uvw<T> { pub u:T, pub v:T, pub w:T }
vec_impl_vec!($c_or_simd struct Uvw uvw (3) ("({}, {}, {})") (u v w) (u v w) (0 1 2) (T,T,T));
vec_impl_vec!($c_or_simd struct Uvw uvw (3) ("({...}, {...}, {...})") ("") (u v w) (u v w) (0 1 2) (T,T,T));

impl<T> From<Vec3<T>> for Uvw<T> {
fn from(v: Vec3<T>) -> Self {
Expand All @@ -3149,7 +3160,7 @@ macro_rules! vec_impl_all_vecs {
#[cfg_attr(feature="serde", derive(Serialize, Deserialize))]
$(#[$repr_attrs])+
pub struct Uv<T> { pub u:T, pub v:T }
vec_impl_vec!($c_or_simd struct Uv uv (2) ("({}, {})") (u v) (u v) (0 1) (T,T));
vec_impl_vec!($c_or_simd struct Uv uv (2) ("({...}, {...})") ("") (u v) (u v) (0 1) (T,T));

impl<T> From<Vec2<T>> for Uv<T> {
fn from(v: Vec2<T>) -> Self {
Expand Down