---

yaml
---
r: 40831
b: refs/heads/dist-snap
c: 2c21f34
h: refs/heads/master
i:
  40829: 5e94dee
  40827: 21b0e18
  40823: e943c48
  40815: 3e9a63e
  40799: 32c8d5c
  40767: 993b40a
  40703: 0e49dc7
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: dbc52ce505eb5da181a658606a6129962a90c403
+refs/heads/dist-snap: 2c21f348a45f593ed4452fab9d083283cd4e7ce0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -398,28 +398,51 @@ pub fn rsplitn<T: Copy>(v: &[T], n: uint, f: fn(t: &T) -> bool) -> ~[~[T]] {
 // Mutators
 
 /// Removes the first element from a vector and return it
-pub fn shift<T>(v: &mut ~[T]) -> T {
-    let ln = v.len();
-    assert (ln > 0);
+pub fn shift<T>(v: &mut ~[T]) -> T unsafe {
 
-    let mut vv = ~[];
-    *v <-> vv;
+    assert v.is_not_empty();
 
-    unsafe {
-        let mut rr;
-        {
-            let vv = raw::to_ptr(vv);
-            rr = move *vv;
-
-            for uint::range(1, ln) |i| {
-                let r = move *ptr::offset(vv, i);
-                v.push(r);
-            }
-        }
-        raw::set_len(&mut vv, 0);
+    if v.len() == 1 { return v.pop() }
 
-        rr
+    if v.len() == 2 {
+        let last = v.pop();
+        let first = v.pop();
+        v.push(last);
+        return first;
     }
+
+    let ln = v.len();
+    let next_ln = v.len() - 1;
+
+    // Save the last element. We're going to overwrite its position
+    let mut work_elt = v.pop();
+    // We still should have room to work where what last element was
+    assert capacity(v) >= ln;
+    // Pretend like we have the original length so we can use
+    // the vector memcpy to overwrite the hole we just made
+    raw::set_len(v, ln);
+
+    // Memcopy the head element (the one we want) to the location we just
+    // popped. For the moment it unsafely exists at both the head and last
+    // positions
+    let first_slice = view(*v, 0, 1);
+    let last_slice = mut_view(*v, next_ln, ln);
+    raw::memcpy(last_slice, first_slice, 1);
+
+    // Memcopy everything to the left one element
+    let init_slice = mut_view(*v, 0, next_ln);
+    let tail_slice = view(*v, 1, ln);
+    raw::memcpy(init_slice, tail_slice, next_ln);
+
+    // Set the new length. Now the vector is back to normal
+    raw::set_len(v, next_ln);
+
+    // Swap out the element we want from the end
+    let vp = raw::to_mut_ptr(*v);
+    let vp = ptr::mut_offset(vp, next_ln - 1);
+    *vp <-> work_elt;
+
+    return work_elt;
 }
 
 /// Prepend an element to the vector
@@ -1760,7 +1783,7 @@ pub struct UnboxedVecRepr {
 }
 
 /// Unsafe operations
-mod raw {
+pub mod raw {
 
     /// The internal representation of a (boxed) vector
     pub struct VecRepr {