auto merge of #5292 : thestinger/rust/nil, r=graydon

2013-03-11 17:27:43 -07:00 · 2013-03-11 17:27:43 -07:00 · a6bb4a0f1a
commit a6bb4a0f1a
parent f4dba956ec 80c71c839a
1 changed files with 6 additions and 1 deletions
--- a/src/libcore/nil.rs
+++ b/src/libcore/nil.rs
@ -15,7 +15,7 @@
 */

 #[cfg(notest)]
-use cmp::{Eq, Ord};
+use cmp::{Eq, Ord, TotalOrd, Ordering, Equal};

 #[cfg(notest)]
 impl Eq for () {
@ -37,3 +37,8 @@ impl Ord for () {
    pure fn gt(&self, _other: &()) -> bool { false }
 }

+#[cfg(notest)]
+impl TotalOrd for () {
+    #[inline(always)]
+    pure fn cmp(&self, _other: &()) -> Ordering { Equal }
+}