diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 14:40:09 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-11 15:05:39 -0800 |
| commit | 315730fb273c4d55c4c25d4fba2b68dcd6a54093 (patch) | |
| tree | 7d7a342c44200e32783db6e73b2bd4a90857ac9a /src/libtest | |
| parent | aa0db172de42a981a64730df146ccf3d737c5762 (diff) | |
| download | rust-315730fb273c4d55c4c25d4fba2b68dcd6a54093.tar.gz rust-315730fb273c4d55c4c25d4fba2b68dcd6a54093.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libtest')
| -rw-r--r-- | src/libtest/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index cc7ea343ee2..cc468df87f3 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -40,7 +40,6 @@ #![feature(hash)] #![feature(int_uint)] #![feature(io)] -#![feature(os)] #![feature(path)] #![feature(rustc_private)] #![feature(staged_api)] @@ -267,7 +266,7 @@ pub fn test_main(args: &[String], tests: Vec<TestDescAndFn> ) { // semantics into parallel test runners, which in turn requires a ~[] // rather than a &[]. pub fn test_main_static(args: env::Args, tests: &[TestDescAndFn]) { - let args = args.map(|s| s.into_string().unwrap()).collect::<Vec<_>>(); + let args = args.collect::<Vec<_>>(); let owned_tests = tests.iter().map(|t| { match t.testfn { StaticTestFn(f) => TestDescAndFn { testfn: StaticTestFn(f), desc: t.desc.clone() }, |