---

brson · brson · commit 587a750ef786 · 2013-01-14T14:11:26.000-08:00
yaml --- r: 42417 b: refs/heads/try c: 0ca369e h: refs/heads/master i: 42415: 83f6cd6 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 3962dec67cc8f48b47c7efce29416144365d772c
+refs/heads/try: 0ca369e9dc5f6ea0ba0c38d047e8d931badfc82c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
diff --git a/branches/try/src/libcore/vec.rs b/branches/try/src/libcore/vec.rs
@@ -895,9 +895,8 @@ pub fn retain<T>(v: &mut ~[T], f: pure fn(t: &T) -> bool) {
         }
     }
 
-    while deleted > 0 {
-        v.pop();
-        deleted -= 1;
+    if deleted > 0 {
+        v.truncate(len - deleted);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -895,9 +895,8 @@ pub fn retain<T>(v: &mut ~[T], f: pure fn(t: &T) -> bool) {`
`895`	`895`	`}`
`896`	`896`	`}`
`897`	`897`
`898`		`- while deleted > 0 {`
`899`		`- v.pop();`
`900`		`- deleted -= 1;`
	`898`	`+ if deleted > 0 {`
	`899`	`+ v.truncate(len - deleted);`
`901`	`900`	`}`
`902`	`901`	`}`
`903`	`902`