---

yaml
---
r: 13958
b: refs/heads/try
c: 694de53
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 2dbaa05af8f2aeef709712725e103836405fa5f5
+refs/heads/try: 694de53d281b5bdf3d187749cca9badf9063cd21
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/vec.rs

@@ -294,27 +294,18 @@ fn shift<T: copy>(&v: [const T]) -> T {
     ret e;
 }
 
-// TODO: Write this, unsafely, in a way that's not O(n).
 /*
 Function: pop
 
 Remove the last element from a vector and return it
 */
-fn pop<T: copy>(&v: [const T]) -> T {
+fn pop<T>(&v: [const T]) -> T unsafe {
     let ln = len(v);
-    assert (ln > 0u);
-    ln -= 1u;
-    let e = v[ln];
-    v = slice(v, 0u, ln);
-    ret e;
-// FIXME use this implementation after the next snapshot (27.01.2012)
-/*  let new_ln = len(v) - 1u;
-    assert (new_ln > 0u);
-    let valptr = ptr::mut_addr_of(v[new_ln]);
+    assert ln > 0u;
+    let valptr = ptr::mut_addr_of(v[ln - 1u]);
     let val <- *valptr;
-    unsafe::set_len(v, new_ln);
+    unsafe::set_len(v, ln - 1u);
     val
-*/
 }
 
 /*