---

yaml
---
r: 10649
b: refs/heads/snap-stage3
c: dc3862b
h: refs/heads/master
i:
  10647: 4a9b668
v: v3

Author: eholk

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3b9848b869c17ca369fc8bc7703e727eb19a211d
+refs/heads/snap-stage3: dc3862bf58297b75a0e3d4dfdf1f66b56f51dd1d
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -379,16 +379,21 @@ fn shift<T>(&v: [T]) -> T {
     v <-> vv;
 
     unsafe {
-        let vv = unsafe::to_ptr(vv);
-        let r <- *vv;
-
-        for uint::range(1u, ln) {|i|
-            // FIXME: this isn't legal, per se...
-            let r <- *ptr::offset(vv, i);
-            push(v, r);
+        let mut rr;
+        {
+            let vv = unsafe::to_ptr(vv);
+            let mut r <- *vv;
+
+            for uint::range(1u, ln) {|i|
+                // FIXME: this isn't legal, per se...
+                let r <- *ptr::offset(vv, i);
+                push(v, r);
+            }
+            rr <- r;
         }
+        unsafe::set_len(vv, 0u);
 
-        r
+        rr
     }
 }