From 13be975b60d3b005a78e31c91be88bb2760a9b9b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 22 Dec 2014 14:53:02 -0800
Subject: [PATCH] Udpate to rust master

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 1d9df5e6b..dc3ddd44d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -936,7 +936,7 @@ impl ToUrlPath for path::windows::Path {
         if !self.is_absolute() {
             return Err(())
         }
-        if path::windows::prefix(self) != Some(path::windows::DiskPrefix) {
+        if path::windows::prefix(self) != Some(path::windows::PathPrefix::DiskPrefix) {
             // FIXME: do something with UNC and other prefixes?
             return Err(())
         }
@@ -998,7 +998,7 @@ impl FromUrlPath for path::windows::Path {
             Some(path) => {
                 debug_assert!(path.is_absolute(),
                               "to_file_path() failed to produce an absolute Path");
-                debug_assert!(path::windows::prefix(&path) == Some(path::windows::DiskPrefix),
+                debug_assert!(path::windows::prefix(&path) == Some(path::windows::PathPrefix::DiskPrefix),
                               "to_file_path() failed to produce a Path with a disk prefix");
                 Ok(path)
             }