From a50c587242903f5c3d69e3684c8a79d3dcd849b7 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 3 Dec 2014 10:09:53 -0500 Subject: libcoretest: fix fallout --- src/libcoretest/iter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcoretest') diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs index d046faa82d4..acc2eab60e7 100644 --- a/src/libcoretest/iter.rs +++ b/src/libcoretest/iter.rs @@ -221,7 +221,7 @@ fn test_iterator_flat_map() { #[test] fn test_inspect() { let xs = [1u, 2, 3, 4]; - let mut n = 0; + let mut n = 0u; let ys = xs.iter() .map(|&x| x) -- cgit 1.4.1-3-g733a5 From 47acce498a9413f3d4b24993e231393cbbcb6346 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 4 Dec 2014 20:01:55 -0500 Subject: libcoretest: fix fallout in unit tests --- src/libcoretest/lib.rs | 1 + src/libcoretest/str.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/libcoretest') diff --git a/src/libcoretest/lib.rs b/src/libcoretest/lib.rs index 5f31ed35f1b..089a2cc880e 100644 --- a/src/libcoretest/lib.rs +++ b/src/libcoretest/lib.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. #![feature(globs, unsafe_destructor, macro_rules, slicing_syntax)] +#![feature(unboxed_closures)] extern crate core; extern crate test; diff --git a/src/libcoretest/str.rs b/src/libcoretest/str.rs index 9574aeb3762..763fcccdbfd 100644 --- a/src/libcoretest/str.rs +++ b/src/libcoretest/str.rs @@ -54,7 +54,7 @@ fn test_rsplitn_char_iterator() { split.reverse(); assert_eq!(split, vec!["\nMäry häd ä", "little", "lämb\nLittle", "lämb\n"]); - let mut split: Vec<&str> = data.rsplitn(3, |c: char| c == ' ').collect(); + let mut split: Vec<&str> = data.rsplitn(3, |&: c: char| c == ' ').collect(); split.reverse(); assert_eq!(split, vec!["\nMäry häd ä", "little", "lämb\nLittle", "lämb\n"]); @@ -63,7 +63,7 @@ fn test_rsplitn_char_iterator() { split.reverse(); assert_eq!(split, vec!["\nMäry häd ", " little l", "mb\nLittle l", "mb\n"]); - let mut split: Vec<&str> = data.rsplitn(3, |c: char| c == 'ä').collect(); + let mut split: Vec<&str> = data.rsplitn(3, |&: c: char| c == 'ä').collect(); split.reverse(); assert_eq!(split, vec!["\nMäry häd ", " little l", "mb\nLittle l", "mb\n"]); } @@ -79,10 +79,10 @@ fn test_split_char_iterator() { rsplit.reverse(); assert_eq!(rsplit, vec!["\nMäry", "häd", "ä", "little", "lämb\nLittle", "lämb\n"]); - let split: Vec<&str> = data.split(|c: char| c == ' ').collect(); + let split: Vec<&str> = data.split(|&: c: char| c == ' ').collect(); assert_eq!( split, vec!["\nMäry", "häd", "ä", "little", "lämb\nLittle", "lämb\n"]); - let mut rsplit: Vec<&str> = data.split(|c: char| c == ' ').rev().collect(); + let mut rsplit: Vec<&str> = data.split(|&: c: char| c == ' ').rev().collect(); rsplit.reverse(); assert_eq!(rsplit, vec!["\nMäry", "häd", "ä", "little", "lämb\nLittle", "lämb\n"]); @@ -94,10 +94,10 @@ fn test_split_char_iterator() { rsplit.reverse(); assert_eq!(rsplit, vec!["\nM", "ry h", "d ", " little l", "mb\nLittle l", "mb\n"]); - let split: Vec<&str> = data.split(|c: char| c == 'ä').collect(); + let split: Vec<&str> = data.split(|&: c: char| c == 'ä').collect(); assert_eq!( split, vec!["\nM", "ry h", "d ", " little l", "mb\nLittle l", "mb\n"]); - let mut rsplit: Vec<&str> = data.split(|c: char| c == 'ä').rev().collect(); + let mut rsplit: Vec<&str> = data.split(|&: c: char| c == 'ä').rev().collect(); rsplit.reverse(); assert_eq!(rsplit, vec!["\nM", "ry h", "d ", " little l", "mb\nLittle l", "mb\n"]); } -- cgit 1.4.1-3-g733a5 From 8df27d26bd258cb54981820fb8c1bc83710970fe Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 5 Dec 2014 10:49:51 -0500 Subject: libcoretest: fix fallout --- src/libcoretest/finally.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcoretest') diff --git a/src/libcoretest/finally.rs b/src/libcoretest/finally.rs index 032f5f71941..2d77c1bc097 100644 --- a/src/libcoretest/finally.rs +++ b/src/libcoretest/finally.rs @@ -45,7 +45,7 @@ fn test_fail() { #[test] fn test_retval() { - let mut closure: || -> int = || 10; + let mut closure = |&mut:| 10i; let i = closure.finally(|| { }); assert_eq!(i, 10); } -- cgit 1.4.1-3-g733a5