---

sanxiyn · sanxiyn · commit 07f1fe9fddd4 · 2013-01-14T19:45:08.000+09:00
yaml --- r: 39847 b: refs/heads/incoming c: e368b16 h: refs/heads/master i: 39845: e9f74ee 39843: a23d225 39839: e07944f v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 23b130441abcfd6c3fbd4de9c6ae3245360bd0a2
+refs/heads/incoming: e368b16f823d627db7d91d5c4fb8598bbb69233c
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/vec.rs b/branches/incoming/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);
     }
 }
 
@@ -2799,13 +2798,6 @@ mod tests {
         assert filter(~[1u, 2u, 4u, 8u, 16u], is_three) == ~[];
     }
 
-    #[test]
-    fn test_retain() {
-        let mut v = ~[1, 2, 3, 4, 5];
-        v.retain(is_odd);
-        assert v == ~[1, 3, 5];
-    }
-
     #[test]
     fn test_foldl() {
         // Test on-stack fold.

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`
`@@ -2799,13 +2798,6 @@ mod tests {`
`2799`	`2798`	`assert filter(~[1u, 2u, 4u, 8u, 16u], is_three) == ~[];`
`2800`	`2799`	`}`
`2801`	`2800`
`2802`		`- #[test]`
`2803`		`- fn test_retain() {`
`2804`		`- let mut v = ~[1, 2, 3, 4, 5];`
`2805`		`- v.retain(is_odd);`
`2806`		`- assert v == ~[1, 3, 5];`
`2807`		`- }`
`2808`		`-`
`2809`	`2801`	`#[test]`
`2810`	`2802`	`fn test_foldl() {`
`2811`	`2803`	`// Test on-stack fold.`