nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-19 02:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add PosixPath and WindowsPath constructor fns

Browse Source
This commit is contained in:
Erick Tryzelaar 2012-11-17 20:23:44 -08:00 committed by Graydon Hoare
parent e1a552a628
commit ab5d84258e
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libcore/path.rs
View File

@ -17,14 +17,22 @@ pub struct WindowsPath {
components: ~[~str], components: ~[~str],
} }
pub pure fn WindowsPath(s: &str) -> WindowsPath {
from_str(s)
}
pub struct PosixPath { pub struct PosixPath {
is_absolute: bool, is_absolute: bool,
components: ~[~str], components: ~[~str],
} }
pub pure fn PosixPath(s: &str) -> PosixPath {
from_str(s)
}
pub trait GenericPath { pub trait GenericPath {
static pure fn from_str((&str)) -> self; static pure fn from_str(&str) -> self;
pure fn dirname() -> ~str; pure fn dirname() -> ~str;
pure fn filename() -> Option<~str>; pure fn filename() -> Option<~str>;
@ -49,7 +57,7 @@ pub type Path = WindowsPath;
#[cfg(windows)] #[cfg(windows)]
pub pure fn Path(s: &str) -> Path { pub pure fn Path(s: &str) -> Path {
from_str::<WindowsPath>(s) WindowsPath(s)
} }
#[cfg(unix)] #[cfg(unix)]
@ -57,7 +65,7 @@ pub type Path = PosixPath;
#[cfg(unix)] #[cfg(unix)]
pub pure fn Path(s: &str) -> Path { pub pure fn Path(s: &str) -> Path {
from_str::<PosixPath>(s) PosixPath(s)
} }
impl PosixPath : ToStr { impl PosixPath : ToStr {
@ -166,7 +174,7 @@ impl PosixPath : GenericPath {
} }
pure fn with_dirname(d: &str) -> PosixPath { pure fn with_dirname(d: &str) -> PosixPath {
let dpath = from_str::<PosixPath>(d); let dpath = PosixPath(d);
match self.filename() { match self.filename() {
Some(ref f) => dpath.push(*f), Some(ref f) => dpath.push(*f),
None => move dpath None => move dpath
@ -365,7 +373,7 @@ impl WindowsPath : GenericPath {
} }
pure fn with_dirname(d: &str) -> WindowsPath { pure fn with_dirname(d: &str) -> WindowsPath {
let dpath = from_str::<WindowsPath>(d); let dpath = WindowsPath(d);
match self.filename() { match self.filename() {
Some(ref f) => dpath.push(*f), Some(ref f) => dpath.push(*f),
None => move dpath None => move dpath
@ -493,12 +501,12 @@ pub pure fn normalize(components: &[~str]) -> ~[~str] {
#[test] #[test]
fn test_double_slash_collapsing() fn test_double_slash_collapsing()
{ {
let path = from_str::<PosixPath>("tmp/"); let path = PosixPath("tmp/");
let path = path.push("/hmm"); let path = path.push("/hmm");
let path = path.normalize(); let path = path.normalize();
assert ~"tmp/hmm" == path.to_str(); assert ~"tmp/hmm" == path.to_str();
let path = from_str::<WindowsPath>("tmp/"); let path = WindowsPath("tmp/");
let path = path.push("/hmm"); let path = path.push("/hmm");
let path = path.normalize(); let path = path.normalize();
assert ~"tmp\\hmm" == path.to_str(); assert ~"tmp\\hmm" == path.to_str();
@ -507,7 +515,7 @@ fn test_double_slash_collapsing()
mod posix { mod posix {
#[cfg(test)] #[cfg(test)]
fn mk(s: &str) -> PosixPath { from_str::<PosixPath>(s) } fn mk(s: &str) -> PosixPath { PosixPath(s) }
#[cfg(test)] #[cfg(test)]
fn t(wp: &PosixPath, s: &str) { fn t(wp: &PosixPath, s: &str) {
@ -661,7 +669,7 @@ mod windows {
#[test] #[test]
fn test_windows_paths() { fn test_windows_paths() {
fn mk(s: &str) -> WindowsPath { from_str::<WindowsPath>(s) } fn mk(s: &str) -> WindowsPath { WindowsPath(s) }
fn t(wp: &WindowsPath, s: &str) { fn t(wp: &WindowsPath, s: &str) {
let ss = wp.to_str(); let ss = wp.to_str();
let sss = str::from_slice(s); let sss = str::from_slice(s);
@ -705,7 +713,7 @@ mod windows {
} }
#[cfg(test)] #[cfg(test)]
fn mk(s: &str) -> PosixPath { from_str::<PosixPath>(s) } fn mk(s: &str) -> PosixPath { PosixPath(s) }
#[test] #[test]
fn test_filetype_foo_bar() { fn test_filetype_foo_bar() {