---

yaml
---
r: 31740
b: refs/heads/dist-snap
c: 79b5f68
h: refs/heads/master
v: v3

Author: msullivan

[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: f110e8f21c707cb4bbb5e54b45f4458987920322
+refs/heads/dist-snap: 79b5f681765ae9d295f4ca8056a90dbbafbe1d9d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -78,6 +78,16 @@ pure fn build<A>(builder: fn(push: pure fn(+A))) -> @[A] {
     build_sized(4, builder)
 }
 
+// Appending
+#[inline(always)]
+pure fn append<T: copy>(lhs: @[T], rhs: &[const T]) -> @[T] {
+    do build_sized(lhs.len() + rhs.len()) |push| {
+        for vec::each(lhs) |x| { push(x); }
+        for uint::range(0, rhs.len()) |i| { push(rhs[i]); }
+    }
+}
+
+
 /// Apply a function to each element of a vector and return the results
 pure fn map<T, U>(v: &[T], f: fn(T) -> U) -> @[U] {
     do build_sized(v.len()) |push| {
@@ -113,6 +123,21 @@ pure fn from_elem<T: copy>(n_elts: uint, t: T) -> @[T] {
     }
 }
 
+impl extensions<T: copy> of vec_concat<T> for @[T] {
+    #[inline(always)]
+    pure fn +(rhs: &[const T]) -> @[T] {
+        append(self, rhs)
+    }
+}
+
+#[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)
+    }
+}
+
 
 mod unsafe {
     type vec_repr = vec::unsafe::vec_repr;
@@ -213,4 +238,10 @@ fn test() {
     assert seq_range(10, 15) == @[10, 11, 12, 13, 14];
     assert from_fn(5, |x| x+1) == @[1, 2, 3, 4, 5];
     assert from_elem(5, 3.14) == @[3.14, 3.14, 3.14, 3.14, 3.14];
-}
+}
+
+#[test]
+fn append_test() {
+    assert @[1,2,3] + @[4,5,6] == @[1,2,3,4,5,6];
+}
+

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

@@ -1211,7 +1211,7 @@ pure fn riteri<T>(v: &[T], f: fn(uint, T)) {
  * The total number of permutations produced is `len(v)!`.  If `v` contains
  * repeated elements, then some permutations are repeated.
  */
-pure fn permute<T: copy>(v: &[T], put: fn(~[T])) {
+pure fn permute<T: copy>(v: &[const T], put: fn(~[T])) {
     let ln = len(v);
     if ln == 0u {
         put(~[]);
@@ -1221,7 +1221,7 @@ pure fn permute<T: copy>(v: &[T], put: fn(~[T])) {
             let elt = v[i];
             let mut rest = slice(v, 0u, i);
             unchecked {
-                push_all(rest, view(v, i+1u, ln));
+                push_all(rest, const_view(v, i+1u, ln));
                 permute(rest, |permutation| {
                     put(append(~[elt], permutation))
                 })