user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #11643 : kballard/rust/path-root-path, r=erickt

Browse source
This commit is contained in:
bors 2014-01-19 15:31:57 -08:00
commit f7cc8a625b
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/path/mod.rs
View file

@ -400,7 +400,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
/// Returns a Path that represents the filesystem root that `self` is rooted in.
///
/// If `self` is not absolute, or vol-relative in the case of Windows, this returns None.
/// If `self` is not absolute, or vol/cwd-relative in the case of Windows, this returns None.
fn root_path(&self) -> Option<Self>;
/// Pushes a path (as a byte vector or string) onto `self`.

9
src/libstd/path/windows.rs
View file

@ -432,9 +432,12 @@ impl GenericPath for Path {
}
fn root_path(&self) -> Option<Path> {
if self.is_absolute() {
if self.prefix.is_some() {
Some(Path::new(match self.prefix {
Some(VerbatimDiskPrefix)|Some(DiskPrefix) => {
Some(DiskPrefix) if self.is_absolute() => {
self.repr.slice_to(self.prefix_len()+1)
}
Some(VerbatimDiskPrefix) => {
self.repr.slice_to(self.prefix_len()+1)
}
_ => self.repr.slice_to(self.prefix_len())
@ -1688,7 +1691,7 @@ mod tests {
fn test_root_path() {
assert_eq!(Path::new("a\\b\\c").root_path(), None);
assert_eq!(Path::new("\\a\\b\\c").root_path(), Some(Path::new("\\")));
assert_eq!(Path::new("C:a").root_path(), None);
assert_eq!(Path::new("C:a").root_path(), Some(Path::new("C:")));
assert_eq!(Path::new("C:\\a").root_path(), Some(Path::new("C:\\")));
assert_eq!(Path::new("\\\\a\\b\\c").root_path(), Some(Path::new("\\\\a\\b")));
assert_eq!(Path::new("\\\\?\\a\\b").root_path(), Some(Path::new("\\\\?\\a")));