---

yaml
---
r: 31483
b: refs/heads/dist-snap
c: dfbe697
h: refs/heads/master
i:
  31481: f22c0c0
  31479: 66e2419
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 725a73c4d5eca5a7cbff019ea44e86623e9065fb
+refs/heads/dist-snap: dfbe6976c2b05af7ef7182c14232713467595a11
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/core.rc

@@ -166,6 +166,7 @@ mod tuple;
 
 // Ubiquitous-utility-type modules
 
+#[cfg(notest)]
 mod ops;
 mod cmp;
 mod num;

branches/dist-snap/src/libcore/core.rs

@@ -30,9 +30,6 @@ import float::num;
 import f32::num;
 import f64::num;
 import num::num;
-import ops::{const, copy, send, owned};
-import ops::{add, sub, mul, div, modulo, neg, bitand, bitor, bitxor, shl};
-import ops::{shr, index};
 
 export path, option, some, none, unreachable;
 export extensions;
@@ -45,8 +42,20 @@ export immutable_copyable_vector, iter_trait_extensions, vec_concat;
 export base_iter, copyable_iter, extended_iter;
 export tuple_ops, extended_tuple_ops;
 export ptr;
+
 // The following exports are the core operators and kinds
+// The compiler has special knowlege of these so we must not duplicate them
+// when compiling for testing
+#[cfg(notest)]
+import ops::{const, copy, send, owned};
+#[cfg(notest)]
+import ops::{add, sub, mul, div, modulo, neg, bitand, bitor, bitxor, shl};
+#[cfg(notest)]
+import ops::{shr, index};
+
+#[cfg(notest)]
 export const, copy, send, owned;
+#[cfg(notest)]
 export add, sub, mul, div, modulo, neg, bitops, index;
 
 // Export the log levels as global constants. Higher levels mean