---

yaml
---
r: 52191
b: refs/heads/dist-snap
c: 6644da5
h: refs/heads/master
i:
  52189: ee14215
  52187: 50cc816
  52183: 0973a29
  52175: 3f5d585
  52159: 7977215
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 6a2e495d673932526676ca6980e0ea8da14725dd
+refs/heads/dist-snap: 6644da5805aa6af93bbe1dcba800d9bdaae56b13
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -413,7 +413,9 @@ pub fn partition<T>(v: ~[T], f: fn(&T) -> bool) -> (~[T], ~[T]) {
     let mut lefts  = ~[];
     let mut rights = ~[];
 
-    do v.consume |_, elt| {
+    // FIXME (#4355 maybe): using v.consume here crashes
+    // do v.consume |_, elt| {
+    do consume(v) |_, elt| {
         if f(&elt) {
             lefts.push(elt);
         } else {
@@ -855,7 +857,9 @@ pub pure fn filter_map<T, U: Copy>(v: &[T], f: fn(t: &T) -> Option<U>)
  */
 pub fn filter<T>(v: ~[T], f: fn(t: &T) -> bool) -> ~[T] {
     let mut result = ~[];
-    do v.consume |_, elem| {
+    // FIXME (#4355 maybe): using v.consume here crashes
+    // do v.consume |_, elem| {
+    do consume(v) |_, elem| {
         if f(&elem) { result.push(elem); }
     }
     result
@@ -3186,10 +3190,11 @@ mod tests {
 
     #[test]
     fn test_partition() {
-        assert (~[]).partition(|x: &int| *x < 3) == (~[], ~[]);
-        assert (~[1, 2, 3]).partition(|x: &int| *x < 4) == (~[1, 2, 3], ~[]);
-        assert (~[1, 2, 3]).partition(|x: &int| *x < 2) == (~[1], ~[2, 3]);
-        assert (~[1, 2, 3]).partition(|x: &int| *x < 0) == (~[], ~[1, 2, 3]);
+        // FIXME (#4355 maybe): using v.partition here crashes
+        assert partition(~[], |x: &int| *x < 3) == (~[], ~[]);
+        assert partition(~[1, 2, 3], |x: &int| *x < 4) == (~[1, 2, 3], ~[]);
+        assert partition(~[1, 2, 3], |x: &int| *x < 2) == (~[1], ~[2, 3]);
+        assert partition(~[1, 2, 3], |x: &int| *x < 0) == (~[], ~[1, 2, 3]);
     }
 
     #[test]