about summary refs log tree commit diff
path: root/src/compiletest
diff options
context:
space:
mode:
authorKevin Ballard <kevin@sb.org>2013-12-03 19:15:12 -0800
committerKevin Ballard <kevin@sb.org>2013-12-04 22:33:53 -0800
commit408dc5ad1b657eb2261e7ac680b8d100469e5477 (patch)
treebf2b7e8a7c1a5161b5fe531925fa2e0d9e5f34f5 /src/compiletest
parentbd5305fbc818d0f59eaabcfd08f19e8c23ea931f (diff)
Revert "libstd: Change `Path::new` to `Path::init`."
This reverts commit c54427ddfbbab41a39d14f2b1dc4f080cbc2d41b.

Leave the #[ignores] in that were added to rustpkg tests.

Conflicts:
	src/librustc/driver/driver.rs
	src/librustc/metadata/creader.rs
Diffstat (limited to 'src/compiletest')
-rw-r--r--src/compiletest/compiletest.rs12
-rw-r--r--src/compiletest/header.rs4
-rw-r--r--src/compiletest/runtest.rs4
3 files changed, 10 insertions, 10 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 1f06b9700c2..0f39b29c60a 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -103,15 +103,15 @@ pub fn parse_config(args: ~[~str]) -> config {
     }
 
     fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
-        Path::init(m.opt_str(nm).unwrap())
+        Path::new(m.opt_str(nm).unwrap())
     }
 
     config {
         compile_lib_path: matches.opt_str("compile-lib-path").unwrap(),
         run_lib_path: matches.opt_str("run-lib-path").unwrap(),
         rustc_path: opt_path(matches, "rustc-path"),
-        clang_path: matches.opt_str("clang-path").map(|s| Path::init(s)),
-        llvm_bin_path: matches.opt_str("llvm-bin-path").map(|s| Path::init(s)),
+        clang_path: matches.opt_str("clang-path").map(|s| Path::new(s)),
+        llvm_bin_path: matches.opt_str("llvm-bin-path").map(|s| Path::new(s)),
         src_base: opt_path(matches, "src-base"),
         build_base: opt_path(matches, "build-base"),
         aux_base: opt_path(matches, "aux-base"),
@@ -124,10 +124,10 @@ pub fn parse_config(args: ~[~str]) -> config {
             } else {
                 None
             },
-        logfile: matches.opt_str("logfile").map(|s| Path::init(s)),
-        save_metrics: matches.opt_str("save-metrics").map(|s| Path::init(s)),
+        logfile: matches.opt_str("logfile").map(|s| Path::new(s)),
+        save_metrics: matches.opt_str("save-metrics").map(|s| Path::new(s)),
         ratchet_metrics:
-            matches.opt_str("ratchet-metrics").map(|s| Path::init(s)),
+            matches.opt_str("ratchet-metrics").map(|s| Path::new(s)),
         ratchet_noise_percent:
             matches.opt_str("ratchet-noise-percent").and_then(|s| from_str::<f64>(s)),
         runtool: matches.opt_str("runtool"),
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index 09e20415ebf..1966701dbde 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -160,10 +160,10 @@ fn parse_exec_env(line: &str) -> Option<(~str, ~str)> {
 
 fn parse_pp_exact(line: &str, testfile: &Path) -> Option<Path> {
     match parse_name_value_directive(line, ~"pp-exact") {
-      Some(s) => Some(Path::init(s)),
+      Some(s) => Some(Path::new(s)),
       None => {
         if parse_name_directive(line, "pp-exact") {
-            testfile.filename().map(|s| Path::init(s))
+            testfile.filename().map(|s| Path::new(s))
         } else {
             None
         }
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 726fbcb5d7a..8e2f2dff9fe 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -45,7 +45,7 @@ pub fn run_metrics(config: config, testfile: ~str, mm: &mut MetricMap) {
         // We're going to be dumping a lot of info. Start on a new line.
         print!("\n\n");
     }
-    let testfile = Path::init(testfile);
+    let testfile = Path::new(testfile);
     debug!("running {}", testfile.display());
     let props = load_props(&testfile);
     debug!("loaded props");
@@ -852,7 +852,7 @@ fn aux_output_dir_name(config: &config, testfile: &Path) -> Path {
 }
 
 fn output_testname(testfile: &Path) -> Path {
-    Path::init(testfile.filestem().unwrap())
+    Path::new(testfile.filestem().unwrap())
 }
 
 fn output_base_name(config: &config, testfile: &Path) -> Path {