diff --git a/mkmain.rs b/mkmain.rs index 9203f4950..a7a16266c 100644 --- a/mkmain.rs +++ b/mkmain.rs @@ -1,7 +1,7 @@ #![feature(core, io, os, path)] use std::old_io::{File, Truncate, ReadWrite}; use std::os; -use std::path::Path; +use std::old_path::Path; static TEMPLATE: &'static str = "\ #![feature(os)] diff --git a/mkuutils.rs b/mkuutils.rs index abeb53f60..119957507 100644 --- a/mkuutils.rs +++ b/mkuutils.rs @@ -2,7 +2,7 @@ use std::old_io::{File, Truncate, Write}; use std::os; -use std::path::Path; +use std::old_path::Path; fn main() { let args = os::args(); diff --git a/src/cat/cat.rs b/src/cat/cat.rs index 0f24ef944..9bf701391 100644 --- a/src/cat/cat.rs +++ b/src/cat/cat.rs @@ -262,7 +262,7 @@ fn open(path: &str) -> Option<(Box, bool)> { return Some((box stdin as Box, interactive)); } - match File::open(&std::path::Path::new(path)) { + match File::open(&std::old_path::Path::new(path)) { Ok(f) => Some((box f as Box, false)), Err(e) => { (writeln!(&mut stderr(), "cat: {0}: {1}", path, e.to_string())).unwrap(); diff --git a/src/comm/comm.rs b/src/comm/comm.rs index 33d4e9269..30b4e49dc 100644 --- a/src/comm/comm.rs +++ b/src/comm/comm.rs @@ -16,7 +16,7 @@ use std::cmp::Ordering; use std::old_io::{BufferedReader, IoResult, print}; use std::old_io::fs::File; use std::old_io::stdio::{stdin, StdinReader}; -use std::path::Path; +use std::old_path::Path; static NAME : &'static str = "comm"; static VERSION : &'static str = "1.0.0"; diff --git a/src/dirname/dirname.rs b/src/dirname/dirname.rs index a08adc523..89eb47aa2 100644 --- a/src/dirname/dirname.rs +++ b/src/dirname/dirname.rs @@ -53,7 +53,7 @@ directory).", &opts).as_slice()); if !matches.free.is_empty() { for path in matches.free.iter() { - let p = std::path::Path::new(path.clone()); + let p = std::old_path::Path::new(path.clone()); let d = std::str::from_utf8(p.dirname()); if d.is_ok() { print(d.unwrap()); diff --git a/src/du/du.rs b/src/du/du.rs index 343cb6580..2ca2584e9 100644 --- a/src/du/du.rs +++ b/src/du/du.rs @@ -19,7 +19,7 @@ extern crate time; use std::old_io::{stderr, fs, FileStat, FileType}; use std::num::Float; use std::option::Option; -use std::path::Path; +use std::old_path::Path; use std::sync::{Arc, Future}; use time::Timespec; diff --git a/src/head/head.rs b/src/head/head.rs index 789bd760a..4c06541d4 100644 --- a/src/head/head.rs +++ b/src/head/head.rs @@ -18,7 +18,7 @@ use std::char::CharExt; use std::old_io::{stdin}; use std::old_io::{BufferedReader, BytesReader}; use std::old_io::fs::File; -use std::path::Path; +use std::old_path::Path; use std::str::from_utf8; use getopts::{optopt, optflag, getopts, usage}; diff --git a/src/link/link.rs b/src/link/link.rs index 5bc2bb103..4dc3c710f 100644 --- a/src/link/link.rs +++ b/src/link/link.rs @@ -13,7 +13,7 @@ extern crate getopts; use std::old_io::fs::link; -use std::path::Path; +use std::old_path::Path; #[path="../common/util.rs"] #[macro_use] diff --git a/src/mv/mv.rs b/src/mv/mv.rs index 7c8695f54..be6692f9b 100644 --- a/src/mv/mv.rs +++ b/src/mv/mv.rs @@ -16,7 +16,7 @@ extern crate getopts; use std::old_io::{BufferedReader, IoResult, fs}; use std::old_io::stdio::stdin_raw; use std::old_io::fs::PathExtensions; -use std::path::GenericPath; +use std::old_path::GenericPath; use getopts::{ getopts, optflag, diff --git a/src/nl/nl.rs b/src/nl/nl.rs index cd8407c5b..3cfb30531 100644 --- a/src/nl/nl.rs +++ b/src/nl/nl.rs @@ -21,7 +21,7 @@ use std::old_io::BufferedReader; use std::old_io::fs::File; use std::iter::repeat; use std::num::Int; -use std::path::Path; +use std::old_path::Path; use getopts::{optopt, optflag, getopts, usage, OptGroup}; #[path="../common/util.rs"] diff --git a/src/sort/sort.rs b/src/sort/sort.rs index 318342cb5..0d3b12093 100644 --- a/src/sort/sort.rs +++ b/src/sort/sort.rs @@ -160,7 +160,7 @@ fn open<'a>(path: &str) -> Option<(Box, bool)> { return Some((Box::new(stdin) as Box, interactive)); } - match File::open(&std::path::Path::new(path)) { + match File::open(&std::old_path::Path::new(path)) { Ok(f) => Some((Box::new(f) as Box, false)), Err(e) => { show_error!("sort: {0}: {1}", path, e.to_string()); diff --git a/src/tail/tail.rs b/src/tail/tail.rs index ccaac02fe..8fa4d69fa 100644 --- a/src/tail/tail.rs +++ b/src/tail/tail.rs @@ -17,7 +17,7 @@ use std::char::CharExt; use std::old_io::{stdin, stdout}; use std::old_io::{BufferedReader, BytesReader}; use std::old_io::fs::File; -use std::path::Path; +use std::old_path::Path; use std::str::from_utf8; use getopts::{optopt, optflag, getopts, usage}; use std::collections::ring_buf::RingBuf; diff --git a/src/test/test.rs b/src/test/test.rs index 57b33dd23..a722e65d2 100644 --- a/src/test/test.rs +++ b/src/test/test.rs @@ -384,7 +384,7 @@ fn path(path: &[u8], cond: PathCondition) -> bool { fn path(path: &[u8], cond: PathCondition) -> bool { use std::old_io::{TypeFile, TypeDirectory, TypeBlockSpecial, TypeNamedPipe}; use std::old_io::fs::{stat}; - use std::path::{Path}; + use std::old_path::{Path}; let path = match Path::new_opt(path) { Some(p) => p,