---

yaml
---
r: 30134
b: refs/heads/incoming
c: 180202f
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0c6e470a257fc546555aa10ededded4a77460a71
+refs/heads/incoming: 180202fa4d5db2b32216f35ec9a8b3c05252efc1
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/cmp.rs

@@ -16,14 +16,17 @@ trait Eq {
     pure fn eq(&&other: self) -> bool;
 }
 
+#[cfg(notest)]
 pure fn lt<T: Ord>(v1: &T, v2: &T) -> bool {
     v1.lt(*v2)
 }
 
+#[cfg(notest)]
 pure fn le<T: Ord Eq>(v1: &T, v2: &T) -> bool {
     v1.lt(*v2) || v1.eq(*v2)
 }
 
+#[cfg(notest)]
 pure fn eq<T: Eq>(v1: &T, v2: &T) -> bool {
     v1.eq(*v2)
 }

branches/incoming/src/libcore/int-template.rs

@@ -1,5 +1,4 @@
 import T = inst::T;
-import cmp::{Eq, Ord};
 import num::from_int;
 
 export min_value, max_value;
@@ -63,19 +62,23 @@ pure fn abs(i: T) -> T {
     if is_negative(i) { -i } else { i }
 }
 
-impl T: Ord {
-    pure fn lt(&&other: T) -> bool {
-        return self < other;
+#[cfg(notest)]
+mod impls {
+    import cmp::{Eq, Ord};
+
+    impl T: Ord {
+        pure fn lt(&&other: T) -> bool {
+            return self < other;
+        }
     }
-}
 
-impl T: Eq {
-    pure fn eq(&&other: T) -> bool {
-        return self == other;
+    impl T: Eq {
+        pure fn eq(&&other: T) -> bool {
+            return self == other;
+        }
     }
 }
 
-
 impl T: num::Num {
     pure fn add(&&other: T)    -> T { return self + other; }
     pure fn sub(&&other: T)    -> T { return self - other; }

branches/incoming/src/libcore/uint-template.rs

@@ -1,5 +1,4 @@
 import T = inst::T;
-import cmp::{Eq, Ord};
 
 export min_value, max_value;
 export min, max;
@@ -56,15 +55,20 @@ pure fn compl(i: T) -> T {
     max_value ^ i
 }
 
-impl T: Ord {
-    pure fn lt(&&other: T) -> bool {
-        return self < other;
+#[cfg(notest)]
+mod impls {
+    import cmp::{Eq, Ord};
+
+    impl T: Ord {
+        pure fn lt(&&other: T) -> bool {
+            return self < other;
+        }
     }
-}
 
-impl T: Eq {
-    pure fn eq(&&other: T) -> bool {
-        return self == other;
+    impl T: Eq {
+        pure fn eq(&&other: T) -> bool {
+            return self == other;
+        }
     }
 }