---

yaml
---
r: 22821
b: refs/heads/master
c: dfbe697
h: refs/heads/master
i:
  22819: ad7e202
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 725a73c4d5eca5a7cbff019ea44e86623e9065fb
+refs/heads/master: dfbe6976c2b05af7ef7182c14232713467595a11
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/core.rc

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

trunk/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