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

2 files changed, 7 insertions, 4 deletions

diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs
index 253d99c11eb..3ba0878b0e6 100644
--- a/src/libstd/path/mod.rs
+++ b/src/libstd/path/mod.rs
@@ -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`.
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index 86a9d2235d0..0e5b7894e74 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -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")));