/// 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`.
}
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())
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")));