---

yaml
---
r: 31485
b: refs/heads/dist-snap
c: e178999
h: refs/heads/master
i:
  31483: 34d986f
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: 2df03bfdca16c23aaa7c3e10a876924edcd18469
+refs/heads/dist-snap: e178999833b9b484c3a5defcccfee2ed7f57e7d9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -60,6 +60,17 @@ export add, sub, mul, div, modulo, neg, bitand, bitor, bitxor;
 #[cfg(notest)]
 export shl, shr, index;
 
+#[cfg(test)]
+use coreops(name = "core", vers = "0.3");
+
+#[cfg(test)]
+import coreops::ops::{const, copy, send, owned};
+#[cfg(test)]
+import coreops::ops::{add, sub, mul, div, modulo, neg, bitand, bitor, bitxor};
+#[cfg(test)]
+import coreops::ops::{shl, shr, index};
+
+
 // Export the log levels as global constants. Higher levels mean
 // more-verbosity. Error is the bottom level, default logging level is
 // warn-and-below.

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

@@ -311,7 +311,7 @@ impl extensions<A:copy> for dvec<A> {
     }
 }
 
-impl extensions<A:copy> of ops::index<uint,A> for dvec<A> {
+impl extensions<A:copy> of index<uint,A> for dvec<A> {
     pure fn index(&&idx: uint) -> A {
         self.get_elt(idx)
     }

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

@@ -1918,7 +1918,8 @@ impl extensions of unique_str for ~str {
     }
 }
 
-impl extensions of ops::add<&str,~str> for ~str {
+#[cfg(notest)]
+impl extensions of add<&str,~str> for ~str {
     #[inline(always)]
     pure fn add(rhs: &str) -> ~str {
         append(self, rhs)

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

@@ -1299,7 +1299,8 @@ impl extensions<T: copy> of vec_concat<T> for ~[T] {
     }
 }
 
-impl extensions<T: copy> of ops::add<&[const T],~[T]> for ~[T] {
+#[cfg(notest)]
+impl extensions<T: copy> of add<&[const T],~[T]> for ~[T] {
     #[inline(always)]
     pure fn add(rhs: &[const T]) -> ~[T] {
         append(self, rhs)
@@ -1313,7 +1314,7 @@ impl extensions<T: copy> of vec_concat<T> for ~[mut T] {
     }
 }
 
-impl extensions<T: copy> of ops::add<&[const T],~[mut T]> for ~[mut T] {
+impl extensions<T: copy> of add<&[const T],~[mut T]> for ~[mut T] {
     #[inline(always)]
     pure fn add(rhs: &[const T]) -> ~[mut T] {
         append_mut(self, rhs)