---

yaml
---
r: 79397
b: refs/heads/snap-stage3
c: fcc7aff
h: refs/heads/master
i:
  79395: df0c15b
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 2bd628eafab1225cdc59c468c32868302b5e92ed
+refs/heads/snap-stage3: fcc7aff62b23f85e8b12bfefb47bc073f49e8e8f
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/fmt/parse.rs

@@ -149,7 +149,6 @@ pub struct SelectArm<'self> {
 pub struct Parser<'self> {
     priv input: &'self str,
     priv cur: str::CharOffsetIterator<'self>,
-    priv depth: uint,
 }
 
 impl<'self> iterator::Iterator<Piece<'self>> for Parser<'self> {
@@ -169,11 +168,6 @@ impl<'self> iterator::Iterator<Piece<'self>> for Parser<'self> {
                 self.escape(); // ensure it's a valid escape sequence
                 Some(String(self.string(pos + 1))) // skip the '\' character
             }
-            Some((_, '}')) if self.depth == 0 => {
-                self.cur.next();
-                self.err(~"unmatched `}` found");
-                None
-            }
             Some((_, '}')) | None => { None }
             Some((pos, _)) => {
                 Some(String(self.string(pos)))
@@ -188,7 +182,6 @@ impl<'self> Parser<'self> {
         Parser {
             input: s,
             cur: s.char_offset_iter(),
-            depth: 0,
         }
     }
 
@@ -400,9 +393,7 @@ impl<'self> Parser<'self> {
             if !self.wsconsume('{') {
                 self.err(~"selector must be followed by `{`");
             }
-            self.depth += 1;
             let pieces = self.collect();
-            self.depth -= 1;
             if !self.wsconsume('}') {
                 self.err(~"selector case must be terminated by `}`");
             }
@@ -503,9 +494,7 @@ impl<'self> Parser<'self> {
             if !self.wsconsume('{') {
                 self.err(~"selector must be followed by `{`");
             }
-            self.depth += 1;
             let pieces = self.collect();
-            self.depth -= 1;
             if !self.wsconsume('}') {
                 self.err(~"selector case must be terminated by `}`");
             }

branches/snap-stage3/src/libstd/str.rs

@@ -1370,8 +1370,6 @@ pub trait StrSlice<'self> {
 
     fn slice_shift_char(&self) -> (char, &'self str);
 
-    fn map_chars(&self, ff: &fn(char) -> char) -> ~str;
-
     fn lev_distance(&self, t: &str) -> uint;
 
     fn subslice_offset(&self, inner: &str) -> uint;
@@ -2088,15 +2086,6 @@ impl<'self> StrSlice<'self> for &'self str {
         return (ch, next_s);
     }
 
-    /// Apply a function to each character.
-    fn map_chars(&self, ff: &fn(char) -> char) -> ~str {
-        let mut result = with_capacity(self.len());
-        for cc in self.iter() {
-            result.push_char(ff(cc));
-        }
-        result
-    }
-
     /// Levenshtein Distance between two strings.
     fn lev_distance(&self, t: &str) -> uint {
         let slen = self.len();

branches/snap-stage3/src/test/compile-fail/ifmt-bad-arg.rs

@@ -71,7 +71,4 @@ fn main() {
     format!("{0, select, other{{}}}", "a"); //~ ERROR: cannot use implicit
     format!("{0, plural, other{{}}}", 1); //~ ERROR: cannot use implicit
     format!("{0, plural, other{{1:.*d}}}", 1, 2); //~ ERROR: cannot use implicit
-
-    format!("foo } bar"); //~ ERROR: unmatched `}` found
-    format!("foo }"); //~ ERROR: unmatched `}` found
 }