From 0cbfa7d040b8e858d9523ac441433b4b188388f1 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Fri, 12 Jul 2013 14:08:25 +1000 Subject: [PATCH] Remove unnecessary method impl (bools now impl Not) --- src/core/vec.rs | 58 +++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 40 deletions(-) diff --git a/src/core/vec.rs b/src/core/vec.rs index 549bf97..1b6b99c 100644 --- a/src/core/vec.rs +++ b/src/core/vec.rs @@ -267,13 +267,6 @@ impl Neg> for Vec2 { } } -impl> Not> for Vec2 { - pub fn not(&self) -> Vec2 { - Vec2::new(!*self.index(0), - !*self.index(1)) - } -} - impl Vec2 { #[inline] pub fn magnitude2(&self) -> T { @@ -409,9 +402,10 @@ impl Vec2 { pub fn all(&self) -> bool { *self.index(0) && *self.index(1) } +} - #[inline] - pub fn not(&self) -> Vec2 { +impl> Not> for Vec2 { + pub fn not(&self) -> Vec2 { Vec2::new(!*self.index(0), !*self.index(1)) } @@ -534,15 +528,15 @@ mod vec2_tests { assert_eq!(tf.any(), true); assert_eq!(tf.all(), false); - assert_eq!(tf.not(), Vec2::new(false, true)); + assert_eq!(!tf, Vec2::new(false, true)); assert_eq!(ff.any(), false); assert_eq!(ff.all(), false); - assert_eq!(ff.not(), Vec2::new(true, true)); + assert_eq!(!ff, Vec2::new(true, true)); assert_eq!(tt.any(), true); assert_eq!(tt.all(), true); - assert_eq!(tt.not(), Vec2::new(false, false)); + assert_eq!(!tt, Vec2::new(false, false)); } } @@ -829,14 +823,6 @@ impl Neg> for Vec3 { } } -impl> Not> for Vec3 { - pub fn not(&self) -> Vec3 { - Vec3::new(!*self.index(0), - !*self.index(1), - !*self.index(2)) - } -} - impl Vec3 { #[inline] pub fn magnitude2(&self) -> T { @@ -984,9 +970,10 @@ impl Vec3 { pub fn all(&self) -> bool { *self.index(0) && *self.index(1) && *self.index(2) } +} - #[inline] - pub fn not(&self) -> Vec3 { +impl> Not> for Vec3 { + pub fn not(&self) -> Vec3 { Vec3::new(!*self.index(0), !*self.index(1), !*self.index(2)) @@ -1125,15 +1112,15 @@ mod vec3_tests{ assert_eq!(tft.any(), true); assert_eq!(tft.all(), false); - assert_eq!(tft.not(), Vec3::new(false, true, false)); + assert_eq!(!tft, Vec3::new(false, true, false)); assert_eq!(fff.any(), false); assert_eq!(fff.all(), false); - assert_eq!(fff.not(), Vec3::new(true, true, true)); + assert_eq!(!fff, Vec3::new(true, true, true)); assert_eq!(ttt.any(), true); assert_eq!(ttt.all(), true); - assert_eq!(ttt.not(), Vec3::new(false, false, false)); + assert_eq!(!ttt, Vec3::new(false, false, false)); } } @@ -1408,15 +1395,6 @@ impl Neg> for Vec4 { } } -impl> Not> for Vec4 { - pub fn not(&self) -> Vec4 { - Vec4::new(!*self.index(0), - !*self.index(1), - !*self.index(2), - !*self.index(3)) - } -} - impl Vec4 { #[inline] pub fn magnitude2(&self) -> T { @@ -1576,9 +1554,10 @@ impl Vec4 { pub fn all(&self) -> bool { *self.index(0) && *self.index(1) && *self.index(2) && *self.index(3) } +} - #[inline] - pub fn not(&self) -> Vec4 { +impl> Not> for Vec4 { + pub fn not(&self) -> Vec4 { Vec4::new(!*self.index(0), !*self.index(1), !*self.index(2), @@ -1586,7 +1565,6 @@ impl Vec4 { } } - #[cfg(test)] mod vec4_tests { use core::vec::*; @@ -1719,14 +1697,14 @@ mod vec4_tests { assert_eq!(tftf.any(), true); assert_eq!(tftf.all(), false); - assert_eq!(tftf.not(), Vec4::new(false, true, false, true)); + assert_eq!(!tftf, Vec4::new(false, true, false, true)); assert_eq!(ffff.any(), false); assert_eq!(ffff.all(), false); - assert_eq!(ffff.not(), Vec4::new(true, true, true, true)); + assert_eq!(!ffff, Vec4::new(true, true, true, true)); assert_eq!(tttt.any(), true); assert_eq!(tttt.all(), true); - assert_eq!(tttt.not(), Vec4::new(false, false, false, false)); + assert_eq!(!tttt, Vec4::new(false, false, false, false)); } }