---

tamird · tamird · commit 818cbb91c6c4 · 2015-04-28T21:23:28.000-07:00
yaml --- r: 206210 b: refs/heads/beta c: f7947bc h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 8073af7399ba9dc77a08ead848fef71d9f1ba1b9
+refs/heads/beta: f7947bc9364459b281e6b5c601ae2bcb148839f2
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a
diff --git a/branches/beta/src/libcoretest/option.rs b/branches/beta/src/libcoretest/option.rs
@@ -219,7 +219,6 @@ fn test_ord() {
     assert!(big > None);
 }
 
-/* FIXME(#20575)
 #[test]
 fn test_collect() {
     let v: Option<Vec<isize>> = (0..0).map(|_| Some(0)).collect();
@@ -241,7 +240,7 @@ fn test_collect() {
 
     assert!(v == None);
 }
-*/
+
 
 #[test]
 fn test_cloned() {
diff --git a/branches/beta/src/libcoretest/result.rs b/branches/beta/src/libcoretest/result.rs
@@ -65,7 +65,6 @@ fn test_impl_map_err() {
     assert!(Err::<isize, isize>(1).map_err(|x| x + 1) == Err(2));
 }
 
-/* FIXME(#20575)
 #[test]
 fn test_collect() {
     let v: Result<Vec<isize>, ()> = (0..0).map(|_| Ok::<isize, ()>(0)).collect();
@@ -86,7 +85,6 @@ fn test_collect() {
     let v: Result<Vec<()>, isize> = functions.iter_mut().map(|f| (*f)()).collect();
     assert!(v == Err(1));
 }
-*/
 
 #[test]
 fn test_fmt_default() {

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,6 @@ fn test_ord() {`
`219`	`219`	`assert!(big > None);`
`220`	`220`	`}`
`221`	`221`
`222`		`-/* FIXME(#20575)`
`223`	`222`	`#[test]`
`224`	`223`	`fn test_collect() {`
`225`	`224`	`let v: Option<Vec<isize>> = (0..0).map(\|_\| Some(0)).collect();`
`@@ -241,7 +240,7 @@ fn test_collect() {`
`241`	`240`
`242`	`241`	`assert!(v == None);`
`243`	`242`	`}`
`244`		`-*/`
	`243`	`+`
`245`	`244`
`246`	`245`	`#[test]`
`247`	`246`	`fn test_cloned() {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ fn test_impl_map_err() {`
`65`	`65`	`assert!(Err::<isize, isize>(1).map_err(\|x\| x + 1) == Err(2));`
`66`	`66`	`}`
`67`	`67`
`68`		`-/* FIXME(#20575)`
`69`	`68`	`#[test]`
`70`	`69`	`fn test_collect() {`
`71`	`70`	`let v: Result<Vec<isize>, ()> = (0..0).map(\|_\| Ok::<isize, ()>(0)).collect();`
`@@ -86,7 +85,6 @@ fn test_collect() {`
`86`	`85`	`let v: Result<Vec<()>, isize> = functions.iter_mut().map(\|f\| (*f)()).collect();`
`87`	`86`	`assert!(v == Err(1));`
`88`	`87`	`}`
`89`		`-*/`
`90`	`88`
`91`	`89`	`#[test]`
`92`	`90`	`fn test_fmt_default() {`