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, 12 insertions, 0 deletions

diff --git a/src/libregex/parse/mod.rs b/src/libregex/parse/mod.rs
index 14e34b805a3..29c807882ec 100644
--- a/src/libregex/parse/mod.rs
+++ b/src/libregex/parse/mod.rs
@@ -634,9 +634,14 @@ impl<'a> Parser<'a> {
             let closer =
                 match self.pos('}') {
                     Some(i) => i,
+                    #[cfg(stage0)]
                     None => return self.err(format!(
                         "Missing '\\}' for unclosed '\\{' at position {}",
                         self.chari).as_slice()),
+                    #[cfg(not(stage0))]
+                    None => return self.err(format!(
+                        "Missing '}}' for unclosed '{{' at position {}",
+                        self.chari).as_slice()),
                 };
             if closer - self.chari + 1 == 0 {
                 return self.err("No Unicode class name found.")
@@ -695,11 +700,18 @@ impl<'a> Parser<'a> {
         let start = self.chari + 2;
         let closer =
             match self.pos('}') {
+                #[cfg(stage0)]
                 None => {
                     return self.err(format!("Missing '\\}' for unclosed \
                                              '\\{' at position {}",
                                             start).as_slice())
                 }
+                #[cfg(not(stage0))]
+                None => {
+                    return self.err(format!("Missing '}}' for unclosed \
+                                             '{{' at position {}",
+                                            start).as_slice())
+                }
                 Some(i) => i,
             };
         self.chari = closer;