diff --git a/src/librustpkg/package_id.rs b/src/librustpkg/package_id.rs index e3b3252587a0..2b56bb3885cd 100644 --- a/src/librustpkg/package_id.rs +++ b/src/librustpkg/package_id.rs @@ -37,11 +37,8 @@ pub struct PkgId { } impl Eq for PkgId { - fn eq(&self, p: &PkgId) -> bool { - p.path == self.path && p.version == self.version - } - fn ne(&self, p: &PkgId) -> bool { - !(self.eq(p)) + fn eq(&self, other: &PkgId) -> bool { + self.path == other.path && self.version == other.version } } diff --git a/src/librustpkg/version.rs b/src/librustpkg/version.rs index 4528a02db197..827bb415d407 100644 --- a/src/librustpkg/version.rs +++ b/src/librustpkg/version.rs @@ -40,9 +40,6 @@ impl Eq for Version { _ => false } } - fn ne(&self, other: &Version) -> bool { - !self.eq(other) - } } impl Ord for Version { diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs index b8175e43fb66..926e6e1f6b6e 100644 --- a/src/libstd/bool.rs +++ b/src/libstd/bool.rs @@ -321,8 +321,6 @@ impl TotalOrd for bool { impl Eq for bool { #[inline] fn eq(&self, other: &bool) -> bool { (*self) == (*other) } - #[inline] - fn ne(&self, other: &bool) -> bool { (*self) != (*other) } } #[cfg(not(test))] diff --git a/src/libstd/char.rs b/src/libstd/char.rs index e2612e0e09b4..fcfd54e814bb 100644 --- a/src/libstd/char.rs +++ b/src/libstd/char.rs @@ -397,8 +397,6 @@ impl Char for char { impl Eq for char { #[inline] fn eq(&self, other: &char) -> bool { (*self) == (*other) } - #[inline] - fn ne(&self, other: &char) -> bool { (*self) != (*other) } } #[cfg(not(test))] diff --git a/src/libstd/cmp.rs b/src/libstd/cmp.rs index 28d45abb6881..4bfcf2ce92de 100644 --- a/src/libstd/cmp.rs +++ b/src/libstd/cmp.rs @@ -36,6 +36,8 @@ and `Eq` to overload the `==` and `!=` operators. #[lang="eq"] pub trait Eq { fn eq(&self, other: &Self) -> bool; + + #[inline] fn ne(&self, other: &Self) -> bool { !self.eq(other) } } diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index 6757e3020daa..899d6236aaaa 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -171,8 +171,6 @@ impl Num for f32 {} impl Eq for f32 { #[inline] fn eq(&self, other: &f32) -> bool { (*self) == (*other) } - #[inline] - fn ne(&self, other: &f32) -> bool { (*self) != (*other) } } #[cfg(not(test))] diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index 59389c285570..6ab8350a1154 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -194,8 +194,6 @@ impl Num for f64 {} impl Eq for f64 { #[inline] fn eq(&self, other: &f64) -> bool { (*self) == (*other) } - #[inline] - fn ne(&self, other: &f64) -> bool { (*self) != (*other) } } #[cfg(not(test))] diff --git a/src/libstd/num/float.rs b/src/libstd/num/float.rs index 909eac0cb69b..4dd6fd253333 100644 --- a/src/libstd/num/float.rs +++ b/src/libstd/num/float.rs @@ -331,8 +331,6 @@ impl Num for float {} impl Eq for float { #[inline] fn eq(&self, other: &float) -> bool { (*self) == (*other) } - #[inline] - fn ne(&self, other: &float) -> bool { (*self) != (*other) } } #[cfg(not(test))] diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index 6054d557fa5c..0131feda8306 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -147,8 +147,6 @@ impl Ord for $T { impl Eq for $T { #[inline] fn eq(&self, other: &$T) -> bool { return (*self) == (*other); } - #[inline] - fn ne(&self, other: &$T) -> bool { return (*self) != (*other); } } impl Orderable for $T { diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 8ffaed22d01a..1426142d4656 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -148,8 +148,6 @@ impl Ord for $T { impl Eq for $T { #[inline] fn eq(&self, other: &$T) -> bool { return (*self) == (*other); } - #[inline] - fn ne(&self, other: &$T) -> bool { return (*self) != (*other); } } impl Orderable for $T { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 4b01d29a98b9..4a7ab6d6732e 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -1180,8 +1180,6 @@ pub mod traits { fn eq(&self, other: &~str) -> bool { eq_slice((*self), (*other)) } - #[inline] - fn ne(&self, other: &~str) -> bool { !(*self).eq(other) } } impl Eq for @str { @@ -1189,8 +1187,6 @@ pub mod traits { fn eq(&self, other: &@str) -> bool { eq_slice((*self), (*other)) } - #[inline] - fn ne(&self, other: &@str) -> bool { !(*self).eq(other) } } impl<'self> TotalEq for &'self str {