From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 24 Oct 2012 19:15:21 +0000 (-0700)
Subject: Merge branch 'method-vis-parse'
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=3b6f5a18a2a82fe30975f24e6db40668c260fa8a;p=rust.git

Merge branch 'method-vis-parse'

Conflicts:
	src/libsyntax/parse/parser.rs
---

3b6f5a18a2a82fe30975f24e6db40668c260fa8a
diff --cc src/libsyntax/parse/parser.rs
index e0570c537a7,467e001ede7..1af516424de
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@@ -2603,20 -2604,12 +2604,19 @@@ impl Parser 
              None
          };
  
 -        let mut meths = ~[];
 -        self.expect(token::LBRACE);
 -        while !self.eat(token::RBRACE) {
 -            meths.push(self.parse_method());
 +        let meths_opt;
 +        if self.eat(token::SEMI) {
 +            meths_opt = None;
 +        } else {
 +            let mut meths = ~[];
 +            self.expect(token::LBRACE);
 +            while !self.eat(token::RBRACE) {
-                 let vis = self.parse_visibility();
-                 meths.push(self.parse_method(vis));
++                meths.push(self.parse_method());
 +            }
 +            meths_opt = Some(move meths);
          }
 -        (ident, item_impl(tps, opt_trait, ty, meths), None)
 +
 +        (ident, item_impl(tps, opt_trait, ty, meths_opt), None)
      }
  
      // Instantiates ident <i> with references to <typarams> as arguments.