Skip to content

Commit 92ff12d

Browse files
committed
---
yaml --- r: 39848 b: refs/heads/incoming c: d0751b6 h: refs/heads/master v: v3
1 parent 07f1fe9 commit 92ff12d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: e368b16f823d627db7d91d5c4fb8598bbb69233c
9+
refs/heads/incoming: d0751b6535f0f5ecd5917d88e9b2d75bf563783b
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/iter.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub trait Buildable<A> {
8080
* # Arguments
8181
*
8282
* * size - A hint for an initial size of the sequence
83-
* * builder - A function that will construct the sequence. It recieves
83+
* * builder - A function that will construct the sequence. It receives
8484
* as an argument a function that will push an element
8585
* onto the sequence being constructed.
8686
*/
@@ -256,7 +256,7 @@ pub pure fn find<A: Copy,IA:BaseIter<A>>(self: &IA,
256256
*
257257
* # Arguments
258258
*
259-
* * builder - A function that will construct the sequence. It recieves
259+
* * builder - A function that will construct the sequence. It receives
260260
* as an argument a function that will push an element
261261
* onto the sequence being constructed.
262262
*/
@@ -275,7 +275,7 @@ pub pure fn build<A,B: Buildable<A>>(builder: fn(push: pure fn(A)))
275275
*
276276
* * size - An option, maybe containing initial size of the sequence
277277
* to reserve
278-
* * builder - A function that will construct the sequence. It recieves
278+
* * builder - A function that will construct the sequence. It receives
279279
* as an argument a function that will push an element
280280
* onto the sequence being constructed.
281281
*/

branches/incoming/src/libcore/vec.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,8 +895,9 @@ pub fn retain<T>(v: &mut ~[T], f: pure fn(t: &T) -> bool) {
895895
}
896896
}
897897

898-
if deleted > 0 {
899-
v.truncate(len - deleted);
898+
while deleted > 0 {
899+
v.pop();
900+
deleted -= 1;
900901
}
901902
}
902903

0 commit comments

Comments
 (0)