Remove conflicting ApproxEq impls

This commit is contained in:
Brendan Zabarauskas 2013-07-12 12:19:40 +10:00
parent 3656068f5c
commit 8139e634fb

View file

@ -408,24 +408,6 @@ impl Vec2<bool> {
}
}
impl<T:Clone + Eq + ApproxEq<T>> ApproxEq<T> for Vec2<T> {
#[inline]
pub fn approx_epsilon() -> T {
ApproxEq::approx_epsilon::<T,T>()
}
#[inline]
pub fn approx_eq(&self, other: &Vec2<T>) -> bool {
self.approx_eq_eps(other, &ApproxEq::approx_epsilon::<T,T>())
}
#[inline]
pub fn approx_eq_eps(&self, other: &Vec2<T>, epsilon: &T) -> bool {
self.index(0).approx_eq_eps(other.index(0), epsilon) &&
self.index(1).approx_eq_eps(other.index(1), epsilon)
}
}
#[cfg(test)]
mod vec2_tests {
use core::vec::*;
@ -996,25 +978,6 @@ impl Vec3<bool> {
}
}
impl<T:Clone + Eq + ApproxEq<T>> ApproxEq<T> for Vec3<T> {
#[inline]
pub fn approx_epsilon() -> T {
ApproxEq::approx_epsilon::<T,T>()
}
#[inline]
pub fn approx_eq(&self, other: &Vec3<T>) -> bool {
self.approx_eq_eps(other, &ApproxEq::approx_epsilon::<T,T>())
}
#[inline]
pub fn approx_eq_eps(&self, other: &Vec3<T>, epsilon: &T) -> bool {
self.index(0).approx_eq_eps(other.index(0), epsilon) &&
self.index(1).approx_eq_eps(other.index(1), epsilon) &&
self.index(2).approx_eq_eps(other.index(2), epsilon)
}
}
#[cfg(test)]
mod vec3_tests{
use core::vec::*;
@ -1613,25 +1576,6 @@ impl Vec4<bool> {
}
}
impl<T:Clone + Eq + ApproxEq<T>> ApproxEq<T> for Vec4<T> {
#[inline]
pub fn approx_epsilon() -> T {
ApproxEq::approx_epsilon::<T,T>()
}
#[inline]
pub fn approx_eq(&self, other: &Vec4<T>) -> bool {
self.approx_eq_eps(other, &ApproxEq::approx_epsilon::<T,T>())
}
#[inline]
pub fn approx_eq_eps(&self, other: &Vec4<T>, epsilon: &T) -> bool {
self.index(0).approx_eq_eps(other.index(0), epsilon) &&
self.index(1).approx_eq_eps(other.index(1), epsilon) &&
self.index(2).approx_eq_eps(other.index(2), epsilon) &&
self.index(3).approx_eq_eps(other.index(3), epsilon)
}
}
#[cfg(test)]
mod vec4_tests {