Skip to content

Commit b5d4ef9

Browse files
committed
---
yaml --- r: 33094 b: refs/heads/dist-snap c: 4155a60 h: refs/heads/master v: v3
1 parent 67a8e0b commit b5d4ef9

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 213725407b8f70dfe9f45d636f759a8ccd9451ca
10+
refs/heads/dist-snap: 4155a60c75fbfe322207e99b7bd541bedf088ada
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,10 +1918,9 @@ impl<A: Copy> &[A]: iter::CopyableIter<A> {
19181918
}
19191919
pure fn to_vec() -> ~[A] { iter::to_vec(&self) }
19201920

1921-
// FIXME--bug in resolve prevents this from working (#2611)
1922-
// fn flat_map_to_vec<B:copy,IB:base_iter<B>>(op: fn(A) -> IB) -> ~[B] {
1923-
// iter::flat_map_to_vec(self, op)
1924-
// }
1921+
pure fn flat_map_to_vec<B:Copy,IB:BaseIter<B>>(op: fn(A) -> IB) -> ~[B] {
1922+
iter::flat_map_to_vec(&self, op)
1923+
}
19251924

19261925
pub pure fn find(p: fn(a: A) -> bool) -> Option<A> {
19271926
iter::find(&self, p)

0 commit comments

Comments
 (0)