From 315730fb273c4d55c4c25d4fba2b68dcd6a54093 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 11 Feb 2015 14:40:09 -0800
Subject: Test fixes and rebase conflicts

---
 src/libtest/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/libtest')

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() },
-- 
cgit 1.4.1-3-g733a5