---

yaml
---
r: 36508
b: refs/heads/try2
c: b52a4b4
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 3ed9fbd63c6a3c6226bc466786e6d3c1bfec856d
+refs/heads/try2: b52a4b412e515620c2c3ccbe8b7f8c7e0300f6ff
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/bool.rs

@@ -65,6 +65,7 @@ pub fn all_values(blk: fn(v: bool)) {
 /// converts truth value to an 8 bit byte
 pub pure fn to_bit(v: bool) -> u8 { if v { 1u8 } else { 0u8 } }
 
+#[cfg(notest)]
 impl bool : cmp::Eq {
     pure fn eq(&self, other: &bool) -> bool { (*self) == (*other) }
     pure fn ne(&self, other: &bool) -> bool { (*self) != (*other) }

branches/try2/src/libcore/box.rs

@@ -27,11 +27,13 @@ pub pure fn ptr_eq<T>(a: @T, b: @T) -> bool {
     unsafe { ptr::addr_of(&(*a)) == ptr::addr_of(&(*b)) }
 }
 
+#[cfg(notest)]
 impl<T:Eq> @const T : Eq {
     pure fn eq(&self, other: &@const T) -> bool { *(*self) == *(*other) }
     pure fn ne(&self, other: &@const T) -> bool { *(*self) != *(*other) }
 }
 
+#[cfg(notest)]
 impl<T:Ord> @const T : Ord {
     pure fn lt(&self, other: &@const T) -> bool { *(*self) < *(*other) }
     pure fn le(&self, other: &@const T) -> bool { *(*self) <= *(*other) }

branches/try2/src/libcore/char.rs

@@ -180,6 +180,7 @@ pub pure fn cmp(a: char, b: char) -> int {
     else { 0 }
 }
 
+#[cfg(notest)]
 impl char : Eq {
     pure fn eq(&self, other: &char) -> bool { (*self) == (*other) }
     pure fn ne(&self, other: &char) -> bool { (*self) != (*other) }

branches/try2/src/libcore/cmp.rs

@@ -14,70 +14,35 @@ and `Eq` to overload the `==` and `!=` operators.
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-pub use nounittest::*;
-pub use unittest::*;
-
-/// Interfaces used for comparison.
-
-// Awful hack to work around duplicate lang items in core test.
-#[cfg(notest)]
-mod nounittest {
-    /**
-     * Trait for values that can be compared for a sort-order.
-     *
-     * Eventually this may be simplified to only require
-     * an `le` method, with the others generated from
-     * default implementations.
-     */
-    #[lang="ord"]
-    pub trait Ord {
-        pure fn lt(&self, other: &self) -> bool;
-        pure fn le(&self, other: &self) -> bool;
-        pure fn ge(&self, other: &self) -> bool;
-        pure fn gt(&self, other: &self) -> bool;
-    }
-
-    #[lang="eq"]
-    /**
-     * Trait for values that can be compared for equality
-     * and inequality.
-     *
-     * Eventually this may be simplified to only require
-     * an `eq` method, with the other generated from
-     * a default implementation.
-     */
-    #[lang="eq"]
-    pub trait Eq {
-        pure fn eq(&self, other: &self) -> bool;
-        pure fn ne(&self, other: &self) -> bool;
-    }
+/**
+* Trait for values that can be compared for equality
+* and inequality.
+*
+* Eventually this may be simplified to only require
+* an `eq` method, with the other generated from
+* a default implementation.
+*/
+#[lang="eq"]
+pub trait Eq {
+    pure fn eq(&self, other: &self) -> bool;
+    pure fn ne(&self, other: &self) -> bool;
 }
 
-#[cfg(test)]
-mod nounittest {
-    #[legacy_exports];}
-
-#[cfg(test)]
-mod unittest {
-    #[legacy_exports];
-
-    pub trait Ord {
-        pure fn lt(&self, other: &self) -> bool;
-        pure fn le(&self, other: &self) -> bool;
-        pure fn ge(&self, other: &self) -> bool;
-        pure fn gt(&self, other: &self) -> bool;
-    }
-
-    pub trait Eq {
-        pure fn eq(&self, other: &self) -> bool;
-        pure fn ne(&self, other: &self) -> bool;
-    }
+/**
+* Trait for values that can be compared for a sort-order.
+*
+* Eventually this may be simplified to only require
+* an `le` method, with the others generated from
+* default implementations.
+*/
+#[lang="ord"]
+pub trait Ord {
+    pure fn lt(&self, other: &self) -> bool;
+    pure fn le(&self, other: &self) -> bool;
+    pure fn ge(&self, other: &self) -> bool;
+    pure fn gt(&self, other: &self) -> bool;
 }
 
-#[cfg(notest)]
-mod unittest {
-    #[legacy_exports];}
-
 pub pure fn lt<T: Ord>(v1: &T, v2: &T) -> bool {
     (*v1).lt(v2)
 }