auto merge of #14831 : alexcrichton/rust/format-intl, r=brson

* The select/plural methods from format strings are removed
* The # character no longer needs to be escaped
* The \-based escapes have been removed
* '{{' is now an escape for '{'
* '}}' is now an escape for '}'

Closes #14810
[breaking-change]

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index e3209c5c186..b9bb0054d44 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -899,10 +899,16 @@ pub fn make_non_verbatim(path: &Path) -> Option<Path> {
             // \\?\D:\
             Path::new(repr.slice_from(4))
         }
+        #[cfg(stage0)]
         Some(VerbatimUNCPrefix(_,_)) => {
             // \\?\UNC\server\share
             Path::new(format!(r"\\{}", repr.slice_from(7)))
         }
+        #[cfg(not(stage0))]
+        Some(VerbatimUNCPrefix(_,_)) => {
+            // \\?\UNC\server\share
+            Path::new(format!(r"\{}", repr.slice_from(7)))
+        }
     };
     if new_path.prefix.is_none() {
         // \\?\UNC\server is a VerbatimUNCPrefix