---

yaml
---
r: 153279
b: refs/heads/try2
c: e2d107c
h: refs/heads/master
i:
  153277: 5d00bfc
  153275: aa7aae4
  153271: 3090a16
  153263: d722a20
  153247: bad7461
  153215: 4beff38
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 7d3899430b71d3ebed6b3fbf6ec47b042f513979
+refs/heads/try2: e2d107c397acbc7b0d9677c36882616308346ed9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcollections/vec.rs

@@ -198,7 +198,13 @@ impl<T: Clone> Vec<T> {
     #[inline]
     pub fn from_slice(values: &[T]) -> Vec<T> {
         let mut vector = Vec::with_capacity(values.len());
-        vector.push_all(values);
+
+        // Directly call `unsafe_push_all_clone` so we can skip a call to
+        // `reserve_addtional`.
+        unsafe {
+            unsafe_push_all_clone(&mut vector, values);
+        }
+
         vector
     }
 
@@ -240,8 +246,9 @@ impl<T: Clone> Vec<T> {
     /// ```
     #[inline]
     pub fn push_all(&mut self, other: &[T]) {
+        self.reserve_additional(other.len());
+
         unsafe {
-            self.reserve_additional(other.len());
             unsafe_push_all_clone(self, other)
         }
     }
@@ -323,31 +330,24 @@ impl<T: Clone> Vec<T> {
 #[unstable]
 impl<T:Clone> Clone for Vec<T> {
     fn clone(&self) -> Vec<T> {
-        unsafe {
-            let mut vector = Vec::with_capacity(self.len);
-            unsafe_push_all_clone(&mut vector, self.as_slice());
-            vector
-        }
+        Vec::from_slice(self.as_slice())
     }
 
     fn clone_from(&mut self, other: &Vec<T>) {
-        unsafe {
-            // drop anything in self that will not be overwritten
-            if self.len() > other.len() {
-                self.truncate(other.len())
-            }
-
-            // reuse the contained values' allocations/resources.
-            for (place, thing) in self.mut_iter().zip(other.iter()) {
-                place.clone_from(thing)
-            }
+        // drop anything in self that will not be overwritten
+        if self.len() > other.len() {
+            self.truncate(other.len())
+        }
 
-            // self.len <= other.len due to the truncate above, so the
-            // slice here is always in-bounds.
-            let slice = other.slice_from(self.len());
-            self.reserve_additional(slice.len());
-            unsafe_push_all_clone(self, slice)
+        // reuse the contained values' allocations/resources.
+        for (place, thing) in self.mut_iter().zip(other.iter()) {
+            place.clone_from(thing)
         }
+
+        // self.len <= other.len due to the truncate above, so the
+        // slice here is always in-bounds.
+        let slice = other.slice_from(self.len());
+        self.push_all(slice);
     }
 }