From d65fee28d356bf4ca8e95e9ced43db28b6db7246 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 27 Mar 2015 13:22:26 -0700
Subject: Test fixes and rebase conflicts, round 2

---
 src/compiletest/compiletest.rs |  1 -
 src/compiletest/procsrv.rs     | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/compiletest')

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 6511bbd8475..f0aacc1460b 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -13,7 +13,6 @@
 #![feature(box_syntax)]
 #![feature(collections)]
 #![feature(old_io)]
-#![feature(old_path)]
 #![feature(rustc_private)]
 #![feature(unboxed_closures)]
 #![feature(std_misc)]
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index ceed88b6236..b30efaa6c29 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -8,11 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(deprecated)] // for old path, for dynamic_lib
-
 use std::dynamic_lib::DynamicLibrary;
 use std::io::prelude::*;
-use std::old_path::Path;
+use std::path::PathBuf;
 use std::process::{ExitStatus, Command, Child, Output, Stdio};
 
 fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
@@ -20,15 +18,15 @@ fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
     // search path for the child.
     let mut path = DynamicLibrary::search_path();
     match aux_path {
-        Some(p) => path.insert(0, Path::new(p)),
+        Some(p) => path.insert(0, PathBuf::from(p)),
         None => {}
     }
-    path.insert(0, Path::new(lib_path));
+    path.insert(0, PathBuf::from(lib_path));
 
     // Add the new dylib search path var
     let var = DynamicLibrary::envvar();
     let newpath = DynamicLibrary::create_path(&path);
-    let newpath = String::from_utf8(newpath).unwrap();
+    let newpath = newpath.to_str().unwrap().to_string();
     cmd.env(var, &newpath);
 }
 
-- 
cgit 1.4.1-3-g733a5