---

yaml
---
r: 171230
b: refs/heads/batch
c: 18e2026
h: refs/heads/master
v: v3

Author: Jorge Aparicio

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 37448506ea575d94389a60dce2aaebd57dba50a3
+refs/heads/batch: 18e2026ff8ae67cf8dea61c938d87f1f45734751
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libcoretest/lib.rs

@@ -30,7 +30,6 @@ mod num;
 mod ops;
 mod option;
 mod ptr;
-mod raw;
 mod result;
 mod slice;
 mod str;

branches/batch/src/libcoretest/option.rs

@@ -220,6 +220,7 @@ fn test_ord() {
     assert!(big > None);
 }
 
+/* FIXME(#20575)
 #[test]
 fn test_collect() {
     let v: Option<Vec<int>> = range(0i, 0).map(|_| Some(0i)).collect();
@@ -234,12 +235,14 @@ fn test_collect() {
     assert!(v == None);
 
     // test that it does not take more elements than it needs
-    let mut functions = [|| Some(()), || None, || panic!()];
+    let mut functions: [Box<Fn() -> Option<()>>; 3] =
+        [box || Some(()), box || None, box || panic!()];
 
     let v: Option<Vec<()>> = functions.iter_mut().map(|f| (*f)()).collect();
 
     assert!(v == None);
 }
+*/
 
 #[test]
 fn test_cloned() {

branches/batch/src/libcoretest/raw.rs

@@ -67,6 +67,7 @@ pub fn test_impl_map_err() {
     assert!(Err::<int, int>(1).map_err(|x| x + 1) == Err(2));
 }
 
+/* FIXME(#20575)
 #[test]
 fn test_collect() {
     let v: Result<Vec<int>, ()> = range(0i, 0).map(|_| Ok::<int, ()>(0)).collect();
@@ -81,11 +82,13 @@ fn test_collect() {
     assert!(v == Err(2));
 
     // test that it does not take more elements than it needs
-    let mut functions = [|| Ok(()), || Err(1i), || panic!()];
+    let mut functions: [Box<Fn() -> Result<(), int>>; 3] =
+        [box || Ok(()), box || Err(1i), box || panic!()];
 
     let v: Result<Vec<()>, int> = functions.iter_mut().map(|f| (*f)()).collect();
     assert!(v == Err(1));
 }
+*/
 
 #[test]
 pub fn test_fmt_default() {