syntax: Stop the bump loop for trait items at } and EOF.

backport of 221d0fbad0b201ef9264d3c9a30cd8c143ed51b2 to beta
with hand-resolution of conflicts and reverting to `try!` syntax.

1 files changed, 17 insertions, 9 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index ccb9654aed4..64dd60feb4e 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -941,7 +941,9 @@ impl<'a> Parser<'a> {
     {
         try!(self.expect(bra));
         let result = self.parse_seq_to_before_end(ket, sep, f);
-        self.bump();
+        if self.token == *ket {
+            self.bump();
+        }
         Ok(result)
     }
 
@@ -1276,15 +1278,21 @@ impl<'a> Parser<'a> {
                     Ok(cua) => cua,
                     Err(e) => {
                         loop {
-                            p.bump();
-                            if p.token == token::Semi {
-                                p.bump();
-                                break;
-                            }
+                            match p.token {
+                                token::Eof => break,
+
+                                token::CloseDelim(token::Brace) |
+                                token::Semi => {
+                                    p.bump();
+                                    break;
+                                }
+
+                                token::OpenDelim(token::Brace) => {
+                                    try!(p.parse_token_tree());
+                                    break;
+                                }
 
-                            if p.token == token::OpenDelim(token::DelimToken::Brace) {
-                                try!(p.parse_token_tree());
-                                break;
+                                _ => p.bump()
                             }
                         }