about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-30 21:40:32 -0700
committerbors <bors@rust-lang.org>2013-08-30 21:40:32 -0700
commitbb35e23f1ca63eba4a3ea25ecdf68a393871ed18 (patch)
tree46ae78240122b0324b698c6e6c57024c74376ef8 /src/libstd
parent5fe553d30f6e3ef7c021092533f1d7c74f6e8fb6 (diff)
parent1ab0ddae5ccc465f64d1a2644c27d32b3e56df54 (diff)
downloadrust-bb35e23f1ca63eba4a3ea25ecdf68a393871ed18.tar.gz
rust-bb35e23f1ca63eba4a3ea25ecdf68a393871ed18.zip
auto merge of #8896 : lightcatcher/rust/default_eq_fix, r=thestinger
Summary:
-removed "ne" methods in libstd and librustpkg
-made default "ne" be inlined
-made one of the "eq" methods in librustpkg follow more standard parameter naming convention
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/bool.rs2
-rw-r--r--src/libstd/char.rs2
-rw-r--r--src/libstd/cmp.rs2
-rw-r--r--src/libstd/num/f32.rs2
-rw-r--r--src/libstd/num/f64.rs2
-rw-r--r--src/libstd/num/float.rs2
-rw-r--r--src/libstd/num/int_macros.rs2
-rw-r--r--src/libstd/num/uint_macros.rs2
-rw-r--r--src/libstd/str.rs4
9 files changed, 2 insertions, 18 deletions
diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs
index b8175e43fb6..926e6e1f6b6 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 e2612e0e09b..fcfd54e814b 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 28d45abb688..4bfcf2ce92d 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 6757e3020da..899d6236aaa 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 59389c28557..6ab8350a115 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 909eac0cb69..4dd6fd25333 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 6054d557fa5..0131feda830 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 8ffaed22d01..1426142d465 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 4b01d29a98b..4a7ab6d6732 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 {