about summary refs log tree commit diff
path: root/src/test
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/test
parentbd5305fbc818d0f59eaabcfd08f19e8c23ea931f (diff)
downloadrust-408dc5ad1b657eb2261e7ac680b8d100469e5477.tar.gz
rust-408dc5ad1b657eb2261e7ac680b8d100469e5477.zip
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/test')
-rw-r--r--src/test/bench/core-std.rs2
-rw-r--r--src/test/bench/shootout-fasta.rs2
-rw-r--r--src/test/bench/shootout-reverse-complement.rs2
-rw-r--r--src/test/run-pass/glob-std.rs6
-rw-r--r--src/test/run-pass/issue-3424.rs2
-rw-r--r--src/test/run-pass/stat.rs2
-rw-r--r--src/test/run-pass/tempfile.rs12
7 files changed, 14 insertions, 14 deletions
diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs
index 97a8323b1b2..c7036f8d9db 100644
--- a/src/test/bench/core-std.rs
+++ b/src/test/bench/core-std.rs
@@ -72,7 +72,7 @@ fn shift_push() {
 fn read_line() {
     use std::io::buffered::BufferedReader;
 
-    let mut path = Path::init(env!("CFG_SRC_DIR"));
+    let mut path = Path::new(env!("CFG_SRC_DIR"));
     path.push("src/test/bench/shootout-k-nucleotide.data");
 
     for _ in range(0, 3) {
diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs
index 797169e7d79..098512e9549 100644
--- a/src/test/bench/shootout-fasta.rs
+++ b/src/test/bench/shootout-fasta.rs
@@ -123,7 +123,7 @@ fn main() {
     };
 
     let writer = if os::getenv("RUST_BENCH").is_some() {
-        let file = File::create(&Path::init("./shootout-fasta.data"));
+        let file = File::create(&Path::new("./shootout-fasta.data"));
         @mut file as @mut io::Writer
     } else {
         @mut io::stdout() as @mut io::Writer
diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout-reverse-complement.rs
index e9d0d60ac0b..161f23182d1 100644
--- a/src/test/bench/shootout-reverse-complement.rs
+++ b/src/test/bench/shootout-reverse-complement.rs
@@ -35,7 +35,7 @@ fn make_complements() -> [u8, ..256] {
 fn main() {
     let complements = make_complements();
     let mut data = if std::os::getenv("RUST_BENCH").is_some() {
-        File::open(&Path::init("shootout-k-nucleotide.data")).read_to_end()
+        File::open(&Path::new("shootout-k-nucleotide.data")).read_to_end()
     } else {
         stdin().read_to_end()
     };
diff --git a/src/test/run-pass/glob-std.rs b/src/test/run-pass/glob-std.rs
index d5dab4445b4..655bc777193 100644
--- a/src/test/run-pass/glob-std.rs
+++ b/src/test/run-pass/glob-std.rs
@@ -22,14 +22,14 @@ use std::io;
 pub fn main() {
     fn mk_file(path: &str, directory: bool) {
         if directory {
-            io::fs::mkdir(&Path::init(path), io::UserRWX);
+            io::fs::mkdir(&Path::new(path), io::UserRWX);
         } else {
-            io::File::create(&Path::init(path));
+            io::File::create(&Path::new(path));
         }
     }
 
     fn abs_path(path: &str) -> Path {
-        os::getcwd().join(&Path::init(path))
+        os::getcwd().join(&Path::new(path))
     }
 
     fn glob_vec(pattern: &str) -> ~[Path] {
diff --git a/src/test/run-pass/issue-3424.rs b/src/test/run-pass/issue-3424.rs
index b941303c38a..02aaee1d01f 100644
--- a/src/test/run-pass/issue-3424.rs
+++ b/src/test/run-pass/issue-3424.rs
@@ -23,7 +23,7 @@ fn tester()
 {
     let loader: rsrc_loader = proc(_path) {result::Ok(~"more blah")};
 
-    let path = path::Path::init("blah");
+    let path = path::Path::new("blah");
     assert!(loader(&path).is_ok());
 }
 
diff --git a/src/test/run-pass/stat.rs b/src/test/run-pass/stat.rs
index 44d46ddf33a..b186a682810 100644
--- a/src/test/run-pass/stat.rs
+++ b/src/test/run-pass/stat.rs
@@ -16,7 +16,7 @@ use extra::tempfile;
 use std::io::File;
 
 pub fn main() {
-    let dir = tempfile::TempDir::new_in(&Path::init("."), "").unwrap();
+    let dir = tempfile::TempDir::new_in(&Path::new("."), "").unwrap();
     let path = dir.path().join("file");
 
     {
diff --git a/src/test/run-pass/tempfile.rs b/src/test/run-pass/tempfile.rs
index 66c7e9a8914..3ab0fe1c058 100644
--- a/src/test/run-pass/tempfile.rs
+++ b/src/test/run-pass/tempfile.rs
@@ -30,7 +30,7 @@ use std::io::fs;
 
 fn test_tempdir() {
     let path = {
-        let p = TempDir::new_in(&Path::init("."), "foobar").unwrap();
+        let p = TempDir::new_in(&Path::new("."), "foobar").unwrap();
         let p = p.path();
         assert!(p.as_vec().ends_with(bytes!("foobar")));
         p.clone()
@@ -83,7 +83,7 @@ fn test_rm_tempdir() {
 // Ideally these would be in std::os but then core would need
 // to depend on std
 fn recursive_mkdir_rel() {
-    let path = Path::init("frob");
+    let path = Path::new("frob");
     let cwd = os::getcwd();
     debug!("recursive_mkdir_rel: Making: {} in cwd {} [{:?}]", path.display(),
            cwd.display(), path.exists());
@@ -94,21 +94,21 @@ fn recursive_mkdir_rel() {
 }
 
 fn recursive_mkdir_dot() {
-    let dot = Path::init(".");
+    let dot = Path::new(".");
     fs::mkdir_recursive(&dot, io::UserRWX);
-    let dotdot = Path::init("..");
+    let dotdot = Path::new("..");
     fs::mkdir_recursive(&dotdot, io::UserRWX);
 }
 
 fn recursive_mkdir_rel_2() {
-    let path = Path::init("./frob/baz");
+    let path = Path::new("./frob/baz");
     let cwd = os::getcwd();
     debug!("recursive_mkdir_rel_2: Making: {} in cwd {} [{:?}]", path.display(),
            cwd.display(), path.exists());
     fs::mkdir_recursive(&path, io::UserRWX);
     assert!(path.is_dir());
     assert!(path.dir_path().is_dir());
-    let path2 = Path::init("quux/blat");
+    let path2 = Path::new("quux/blat");
     debug!("recursive_mkdir_rel_2: Making: {} in cwd {}", path2.display(),
            cwd.display());
     fs::mkdir_recursive(&path2, io::UserRWX);