---

yaml
---
r: 113087
b: refs/heads/try
c: fb77953
h: refs/heads/master
i:
  113085: 1903dc2
  113083: f5e6f56
  113079: b71a693
  113071: 0867ab5
  113055: 4b448b9
  113023: 2000d36
v: v3

Author: lilyball

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: abdacecdf86b4b5a4f432560445a24e1c5f4751b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 922c420fcd4dfbfc7e3bce4dd20d9b17a20b39f3
-refs/heads/try: ea04b2f9541ee7772c87fb6ef45bba4f02395a8e
+refs/heads/try: fb77953a2a15fe77ecbf79d22fd538b1dea73298
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/slice.rs

@@ -579,19 +579,19 @@ pub mod traits {
         fn gt(&self, other: &~[T]) -> bool { self.as_slice() > other.as_slice() }
     }
 
-    impl<'a,T:Clone, V: Vector<T>> Add<V, ~[T]> for &'a [T] {
+    impl<'a,T:Clone, V: Vector<T>> Add<V, Vec<T>> for &'a [T] {
         #[inline]
-        fn add(&self, rhs: &V) -> ~[T] {
+        fn add(&self, rhs: &V) -> Vec<T> {
             let mut res = Vec::with_capacity(self.len() + rhs.as_slice().len());
             res.push_all(*self);
             res.push_all(rhs.as_slice());
-            res.move_iter().collect()
+            res
         }
     }
 
-    impl<T:Clone, V: Vector<T>> Add<V, ~[T]> for ~[T] {
+    impl<T:Clone, V: Vector<T>> Add<V, Vec<T>> for ~[T] {
         #[inline]
-        fn add(&self, rhs: &V) -> ~[T] {
+        fn add(&self, rhs: &V) -> Vec<T> {
             self.as_slice() + rhs.as_slice()
         }
     }

branches/try/src/libstd/unstable/dynamic_lib.rs

@@ -18,13 +18,16 @@ A simple wrapper over the platform's dynamic library facilities
 
 use c_str::ToCStr;
 use cast;
+use iter::Iterator;
 use ops::*;
 use option::*;
 use os;
 use path::GenericPath;
 use path;
 use result::*;
+use slice::{Vector,OwnedVector};
 use str;
+use vec::Vec;
 
 pub struct DynamicLibrary { handle: *u8}
 
@@ -73,8 +76,10 @@ impl DynamicLibrary {
             ("LD_LIBRARY_PATH", ':' as u8)
         };
         let newenv = os::getenv_as_bytes(envvar).unwrap_or(box []);
-        let newenv = newenv + &[sep] + path.as_vec();
-        os::setenv(envvar, str::from_utf8(newenv).unwrap());
+        let mut newenv = newenv.move_iter().collect::<Vec<_>>();
+        newenv.push_all(&[sep]);
+        newenv.push_all(path.as_vec());
+        os::setenv(envvar, str::from_utf8(newenv.as_slice()).unwrap());
     }
 
     /// Access the value at the symbol of the dynamic library

branches/try/src/libstd/vec.rs

@@ -22,7 +22,7 @@ use mem::{size_of, move_val_init};
 use mem;
 use num;
 use num::{CheckedMul, CheckedAdd};
-use ops::Drop;
+use ops::{Add, Drop};
 use option::{None, Option, Some};
 use ptr::RawPtr;
 use ptr;
@@ -1369,6 +1369,16 @@ impl<T> Vector<T> for Vec<T> {
     }
 }
 
+impl<T: Clone, V: Vector<T>> Add<V, Vec<T>> for Vec<T> {
+    #[inline]
+    fn add(&self, rhs: &V) -> Vec<T> {
+        let mut res = Vec::with_capacity(self.len() + rhs.as_slice().len());
+        res.push_all(self.as_slice());
+        res.push_all(rhs.as_slice());
+        res
+    }
+}
+
 #[unsafe_destructor]
 impl<T> Drop for Vec<T> {
     fn drop(&mut self) {